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
This commit is contained in:
Enji Cooper 2017-02-04 17:00:47 +00:00
parent 314a104cd6
commit 9516035d83
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=313234
2 changed files with 9 additions and 3 deletions

View File

@ -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. */

View File

@ -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