d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI and

Browse Source 
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).

MFC after:	2 weeks
PR:		159745
This commit is contained in:
Enji Cooper 2017-01-02 20:29:50 +00:00
parent 86adac04b2
commit 94ef145e6b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -2156,7 +2156,7 @@ secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_LDNS} != "no" .if ${MK_LDNS} != "no"
secure/lib/libssh__L: lib/libldns__L secure/lib/libssh__L: lib/libldns__L
.endif .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 \ secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
lib/libmd__L kerberos5/lib/libroken__L lib/libmd__L kerberos5/lib/libroken__L

2
secure/lib/libssh/Makefile
View File

@ -46,7 +46,7 @@ LIBADD+= ldns
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
SRCS+= 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 CFLAGS+= -include krb5_config.h
SRCS+= krb5_config.h SRCS+= krb5_config.h
.endif .endif

2
secure/usr.bin/ssh/Makefile
View File

@ -23,7 +23,7 @@ LIBADD= ssh
CFLAGS+= -DHAVE_LDNS=1 CFLAGS+= -DHAVE_LDNS=1
.endif .endif
.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h CFLAGS+= -include krb5_config.h
SRCS+= krb5_config.h SRCS+= krb5_config.h
LIBADD+= gssapi LIBADD+= gssapi

2
secure/usr.sbin/sshd/Makefile
View File

@ -47,7 +47,7 @@ LIBADD+= blacklist
LDFLAGS+=-L${LIBBLACKLISTDIR} LDFLAGS+=-L${LIBBLACKLISTDIR}
.endif .endif
.if ${MK_KERBEROS_SUPPORT} != "no" .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -include krb5_config.h CFLAGS+= -include krb5_config.h
SRCS+= krb5_config.h SRCS+= krb5_config.h
LIBADD+= gssapi_krb5 gssapi krb5 LIBADD+= gssapi_krb5 gssapi krb5