Date: Sat, 4 Feb 2017 17:26:28 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r313243 - in stable/11: crypto/openssh secure/usr.sbin/sshd Message-ID: <201702041726.v14HQScO092741@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Feb 4 17:26:28 2017 New Revision: 313243 URL: https://svnweb.freebsd.org/changeset/base/313243 Log: 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 Modified: stable/11/crypto/openssh/config.h stable/11/secure/usr.sbin/sshd/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/crypto/openssh/config.h ============================================================================== --- stable/11/crypto/openssh/config.h Sat Feb 4 17:21:17 2017 (r313242) +++ stable/11/crypto/openssh/config.h Sat Feb 4 17:26:28 2017 (r313243) @@ -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. */ Modified: stable/11/secure/usr.sbin/sshd/Makefile ============================================================================== --- stable/11/secure/usr.sbin/sshd/Makefile Sat Feb 4 17:21:17 2017 (r313242) +++ stable/11/secure/usr.sbin/sshd/Makefile Sat Feb 4 17:26:28 2017 (r313243) @@ -27,7 +27,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= ssh_namespace.h # pam should always happen before ssh here for static linking -LIBADD= pam ssh util wrap +LIBADD= pam ssh util .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -53,6 +53,11 @@ SRCS+= krb5_config.h LIBADD+= gssapi_krb5 gssapi krb5 .endif +.if ${MK_TCP_WRAPPERS} != "no" +CFLAGS+= -DLIBWRAP +LIBADD+= wrap +.endif + LIBADD+= crypto .if defined(LOCALBASE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702041726.v14HQScO092741>