[src/trunk]: src/usr.bin/ssh PR/30750: Mark Davies: ssh gives bogus complaint...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0de1bd6d38b1
branches:  trunk
changeset: 583651:0de1bd6d38b1
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 18 00:19:28 2005 +0000

description:
PR/30750: Mark Davies: ssh gives bogus complaint when gssapi authentication
fails. The problem was that different ssh programs were compiled with different
cpp flags. In particular, ssh-keysign was affected. Move all the CPPFLAGS
to Makefile.inc. Note that I am not moving the library portion of the defines
because we don't want to link everything with all the libraries.

diffstat:

 usr.bin/ssh/Makefile.inc  |  24 +++++++++++++++++++++++-
 usr.bin/ssh/ssh/Makefile  |   6 +-----
 usr.bin/ssh/sshd/Makefile |  10 +---------
 3 files changed, 25 insertions(+), 15 deletions(-)

diffs (123 lines):

diff -r 0a02e1875b2d -r 0de1bd6d38b1 usr.bin/ssh/Makefile.inc
--- a/usr.bin/ssh/Makefile.inc  Wed Aug 17 22:41:33 2005 +0000
+++ b/usr.bin/ssh/Makefile.inc  Thu Aug 18 00:19:28 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2005/03/09 03:11:22 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2005/08/18 00:19:28 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,28 @@
 LDADD+=        -lssh -lcrypto -lcrypt -lz
 DPADD+=        ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
 
+.if (${USE_PAM} != "no")
+CPPFLAGS+=-DUSE_PAM
+.endif
+
+.if (${USE_KERBEROS} != "no")
+
+CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
+CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5
+
+.if ${MKKERBEROS4} != "no"
+CPPFLAGS+=-DKRB4 -DAFS -I${DESTDIR}/usr/include/kerberosIV
+.endif
+
+.endif
+
+CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
+CPPFLAGS+=-DLIBWRAP
+
+.if (${USE_SKEY} != "no")
+CPPFLAGS+=-DSKEY
+.endif
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
diff -r 0a02e1875b2d -r 0de1bd6d38b1 usr.bin/ssh/ssh/Makefile
--- a/usr.bin/ssh/ssh/Makefile  Wed Aug 17 22:41:33 2005 +0000
+++ b/usr.bin/ssh/ssh/Makefile  Thu Aug 18 00:19:28 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2005/03/04 20:44:55 he Exp $
+#      $NetBSD: Makefile,v 1.22 2005/08/18 00:19:28 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -13,18 +13,14 @@
 .if (${USE_KERBEROS} != "no")
 
 # this is not entirely true, libgssapi might be independant of krb5
-CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
 SRCS +=        gss-genr.c
 LDADD+=        -lgssapi
 DPADD+=        ${LIBGSSAPI}
 
-CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5
 LDADD+=        -lkrb5 -lkafs -lasn1 -lcrypt
 DPADD+=        ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
 
 .if ${MKKERBEROS4} != "no"
-CPPFLAGS+=-I${DESTDIR}/usr/include/kerberosIV -DKRB4
-CPPFLAGS+=-DKRB4
 SRCS+=radix.c
 LDADD+=        -lkrb -ldes
 DPADD+=        ${LIBKRB} ${LIBDES}
diff -r 0a02e1875b2d -r 0de1bd6d38b1 usr.bin/ssh/sshd/Makefile
--- a/usr.bin/ssh/sshd/Makefile Wed Aug 17 22:41:33 2005 +0000
+++ b/usr.bin/ssh/sshd/Makefile Thu Aug 18 00:19:28 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2005/07/29 01:19:20 christos Exp $
+#      $NetBSD: Makefile,v 1.27 2005/08/18 00:19:29 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -17,7 +17,6 @@
        kexdhs.c kexgexs.c
 
 .if (${USE_PAM} != "no")
-CPPFLAGS+=-DUSE_PAM
 SRCS+= auth-pam.c
 LDADD+=        -lpam ${PAM_STATIC_LDADD}
 DPADD+=        ${LIBPAM} ${PAM_STATIC_DPADD}
@@ -31,7 +30,6 @@
 
 .if (${USE_KERBEROS} != "no")
 
-CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
 SRCS +=        gss-genr.c auth2-gss.c gss-serv.c gss-serv-krb5.c
 LDADD+=        -lgssapi
 DPADD+=        ${LIBGSSAPI}
@@ -39,13 +37,11 @@
 LDADD+=        -lkafs
 DPADD+= ${LIBKAFS}
 
-CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5
 SRCS+= auth-krb5.c auth2-krb5.c
 LDADD+=        -lkrb5 -lasn1
 DPADD+=        ${LIBKRB5} ${LIBASN1}
 
 .if ${MKKERBEROS4} != "no"
-CPPFLAGS+=-DKRB4 -DAFS -I${DESTDIR}/usr/include/kerberosIV
 SRCS+= auth-krb4.c radix.c
 LDADD+=        -lkrb -ldes
 DPADD+=        ${LIBKRB} ${LIBDES}
@@ -57,17 +53,13 @@
 
 .include <bsd.prog.mk>
 
-CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
-
 LDADD+=        -lcrypt -lutil
 DPADD+=        ${LIBCRYPT} ${LIBUTIL}
 
-CPPFLAGS+=-DLIBWRAP
 LDADD+=        -lwrap
 DPADD+=        ${LIBWRAP}
 
 .if (${USE_SKEY} != "no")
-CPPFLAGS+=-DSKEY
 LDADD+=        -lskey
 DPADD+=        ${LIBSKEY}
 .endif