svn commit: r313234 - in stable/10: crypto/openssh secure/usr.sbin/sshd

[Ngie Cooper]

Author: ngie
Date: Sat Feb  4 17:00:47 2017
New Revision: 313234
URL: https://svnweb.freebsd.org/changeset/base/313234

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/10/crypto/openssh/config.h
  stable/10/secure/usr.sbin/sshd/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/crypto/openssh/config.h
==============================================================================
--- stable/10/crypto/openssh/config.h	Sat Feb  4 16:58:06 2017	(r313233)
+++ stable/10/crypto/openssh/config.h	Sat Feb  4 17:00:47 2017	(r313234)
@@ -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/10/secure/usr.sbin/sshd/Makefile
==============================================================================
--- stable/10/secure/usr.sbin/sshd/Makefile	Sat Feb  4 16:58:06 2017	(r313233)
+++ stable/10/secure/usr.sbin/sshd/Makefile	Sat Feb  4 17:00:47 2017	(r313234)
@@ -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 -
 	-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