svn commit: r312269 - in stable/10: . secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd

[Ngie Cooper]

Author: ngie
Date: Mon Jan 16 07:10:45 2017
New Revision: 312269
URL: https://svnweb.freebsd.org/changeset/base/312269

Log:
  MFC r311140:
  
  Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI and
  MK_KERBEROS_SUPPORT != no
  
  This fixes the odd case where someone specified MK_GSSAPI=no and
  MK_KERBEROS_SUPPORT=yes (which admittedly, probably doesn't make sense,
  but the build system doesn't prevent this case today, and it didn't when
  I filed the bug back in 2011 either).
  
  PR:		159745

Modified:
  stable/10/Makefile.inc1
  stable/10/secure/lib/libssh/Makefile
  stable/10/secure/usr.bin/ssh/Makefile
  stable/10/secure/usr.sbin/sshd/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Mon Jan 16 07:10:42 2017	(r312268)
+++ stable/10/Makefile.inc1	Mon Jan 16 07:10:45 2017	(r312269)
@@ -1770,7 +1770,7 @@ secure/lib/libssh__L: lib/libz__L secure
 .if ${MK_LDNS} != "no"
 secure/lib/libssh__L: lib/libldns__L
 .endif
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L

Modified: stable/10/secure/lib/libssh/Makefile
==============================================================================
--- stable/10/secure/lib/libssh/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
+++ stable/10/secure/lib/libssh/Makefile	Mon Jan 16 07:10:45 2017	(r312269)
@@ -47,7 +47,7 @@ USEPRIVATELIB+= ldns
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	 krb5_config.h
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}

Modified: stable/10/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/10/secure/usr.bin/ssh/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
+++ stable/10/secure/usr.bin/ssh/Makefile	Mon Jan 16 07:10:45 2017	(r312269)
@@ -27,7 +27,7 @@ LDADD+=	-lldns
 USEPRIVATELIB+= ldns
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 DPADD+=	 ${LIBGSSAPI}

Modified: stable/10/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/10/secure/usr.sbin/sshd/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
+++ stable/10/secure/usr.sbin/sshd/Makefile	Mon Jan 16 07:10:45 2017	(r312269)
@@ -42,7 +42,7 @@ DPADD+=  ${LIBBSM}
 LDADD+=  -lbsm
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \