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

[Ngie Cooper]

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

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/11/Makefile.inc1
  stable/11/secure/lib/libssh/Makefile
  stable/11/secure/usr.bin/ssh/Makefile
  stable/11/secure/usr.sbin/sshd/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Mon Jan 16 07:08:06 2017	(r312267)
+++ stable/11/Makefile.inc1	Mon Jan 16 07:10:42 2017	(r312268)
@@ -2099,7 +2099,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/11/secure/lib/libssh/Makefile
==============================================================================
--- stable/11/secure/lib/libssh/Makefile	Mon Jan 16 07:08:06 2017	(r312267)
+++ stable/11/secure/lib/libssh/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
@@ -46,7 +46,7 @@ LIBADD+=	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
 .endif

Modified: stable/11/secure/usr.bin/ssh/Makefile
==============================================================================
--- stable/11/secure/usr.bin/ssh/Makefile	Mon Jan 16 07:08:06 2017	(r312267)
+++ stable/11/secure/usr.bin/ssh/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
@@ -23,7 +23,7 @@ LIBADD=	ssh
 CFLAGS+=	-DHAVE_LDNS=1
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 LIBADD+=	gssapi

Modified: stable/11/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/11/secure/usr.sbin/sshd/Makefile	Mon Jan 16 07:08:06 2017	(r312267)
+++ stable/11/secure/usr.sbin/sshd/Makefile	Mon Jan 16 07:10:42 2017	(r312268)
@@ -47,7 +47,7 @@ LIBADD+= blacklist
 LDFLAGS+=-L${LIBBLACKLISTDIR}
 .endif
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
+.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
 SRCS+=	krb5_config.h
 LIBADD+=	gssapi_krb5 gssapi krb5