diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 17:00:47 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 17:00:47 +0000 |
| commit | 7450b6d765eb2a5a32428d0f44b26c81ce27934a (patch) | |
| tree | 63749a465d8cf90934283c727823cfbbdf5f4d07 | |
| parent | 7aa9877e2de269a30c54ddc21ffdbb6f8141f9fa (diff) | |
| download | FreeBSD-src-7450b6d765eb2a5a32428d0f44b26c81ce27934a.zip FreeBSD-src-7450b6d765eb2a5a32428d0f44b26c81ce27934a.tar.gz | |
MFC r311585:
Conditionalize building libwrap support into sshd
Only build libwrap support into sshd if MK_TCP_WRAPPERS != no
This will unbreak the build if libwrap has been removed from the system
PR: 210141
| -rw-r--r-- | crypto/openssh/config.h | 2 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index ecd014b..3c86255 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -1408,7 +1408,7 @@ /* #undef LASTLOG_WRITE_PUTUTXLINE */ /* Define if you want TCP Wrappers support */ -#define LIBWRAP 1 +/* #undef LIBWRAP */ /* Define to whatever link() returns for "not supported" if it doesn't return EOPNOTSUPP. */ diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 93ae32b..ff82ebf 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -25,8 +25,8 @@ MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h SRCS+= ssh_namespace.h -DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= -lssh -lutil -lwrap ${MINUSLPAM} +DPADD= ${LIBSSH} ${LIBUTIL} ${LIBPAM} +LDADD= -lssh -lutil ${MINUSLPAM} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" @@ -51,6 +51,12 @@ LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ -lcom_err -lroken -lwind -lheimbase -lheimipcc .endif +.if ${MK_TCP_WRAPPERS} != "no" +CFLAGS+= -DLIBWRAP +DPADD+= ${LIBWRAP} +LDADD+= -lwrap +.endif + DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz |
