svn commit: r311218 - stable/10/usr.sbin/bsnmpd/bsnmpd

[Ngie Cooper]

Author: ngie
Date: Wed Jan  4 00:54:34 2017
New Revision: 311218
URL: https://svnweb.freebsd.org/changeset/base/311218

Log:
  MFstable/11 r311215:
  
  MFC r310711:
  
  Don't explicitly build tcp wrappers support into bsnmpd; make it conditional
  on MK_TCP_WRAPPERS != "no"
  
  This likely fixes an issue seen where some of the USE_TCPWRAPPERS code didn't
  work as advertised

Modified:
  stable/10/usr.sbin/bsnmpd/bsnmpd/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/bsnmpd/Makefile	Wed Jan  4 00:53:02 2017	(r311217)
+++ stable/10/usr.sbin/bsnmpd/bsnmpd/Makefile	Wed Jan  4 00:54:34 2017	(r311218)
@@ -125,10 +125,9 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
 
 CFLAGS+= -DSNMPTREE_TYPES
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
-CFLAGS+= -DUSE_TCPWRAPPERS
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
-DPADD=	${LIBBEGEMOT} ${LIBBSNMP} ${LIBWRAP}
-LDADD=	-lbegemot -lbsnmp -lwrap
+DPADD=	${LIBBEGEMOT} ${LIBBSNMP}
+LDADD=	-lbegemot -lbsnmp
 
 LDFLAGS= -Wl,-export-dynamic
 
@@ -136,6 +135,12 @@ LDFLAGS= -Wl,-export-dynamic
 CFLAGS+= -DHAVE_LIBCRYPTO
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DUSE_TCPWRAPPERS
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 oid.h: tree.def Makefile
 	gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}