diff options
| author | ngie <ngie@FreeBSD.org> | 2017-01-16 07:10:45 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-01-16 07:10:45 +0000 |
| commit | 988aeb77cd71653ba0b92ea0aba61ae1ec8fd460 (patch) | |
| tree | 3662dbb107ea7353a3d82b0c1d0727ef969d7822 /secure | |
| parent | efd488014cd43073474b654dea3da8d471204c4e (diff) | |
| download | FreeBSD-src-988aeb77cd71653ba0b92ea0aba61ae1ec8fd460.zip FreeBSD-src-988aeb77cd71653ba0b92ea0aba61ae1ec8fd460.tar.gz | |
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
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 92ba2bd..9ee878e 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -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} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 24f02b3..99ade34 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -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} diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 51a944a..93ae32b 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -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} \ |
