Author: ngie
Date: Sat Jan 7 08:08:35 2017
New Revision: 311585
URL: https://svnweb.freebsd.org/changeset/base/311585
Log:
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
MFC after: 2 weeks
PR: 210141
Submitted by: kp...@protonmail.com
Differential Revision: D9049
Modified:
head/crypto/openssh/config.h
head/secure/usr.sbin/sshd/Makefile
Modified: head/crypto/openssh/config.h
==============================================================================
--- head/crypto/openssh/config.h Sat Jan 7 07:54:23 2017
(r311584)
+++ head/crypto/openssh/config.h Sat Jan 7 08:08:35 2017
(r311585)
@@ -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: head/secure/usr.sbin/sshd/Makefile
==============================================================================
--- head/secure/usr.sbin/sshd/Makefile Sat Jan 7 07:54:23 2017
(r311584)
+++ head/secure/usr.sbin/sshd/Makefile Sat Jan 7 08:08:35 2017
(r311585)
@@ -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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
