Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Dec 2016 16:34:49 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r310711 - head/usr.sbin/bsnmpd/bsnmpd
Message-ID:  <201612281634.uBSGYnGb091298@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Dec 28 16:34:49 2016
New Revision: 310711
URL: https://svnweb.freebsd.org/changeset/base/310711

Log:
  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
  
  MFC after:	1 week

Modified:
  head/usr.sbin/bsnmpd/bsnmpd/Makefile

Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/bsnmpd/Makefile	Wed Dec 28 16:30:08 2016	(r310710)
+++ head/usr.sbin/bsnmpd/bsnmpd/Makefile	Wed Dec 28 16:34:49 2016	(r310711)
@@ -125,9 +125,8 @@ 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
-LIBADD=	begemot bsnmp wrap
+LIBADD=	begemot bsnmp
 
 LDFLAGS= -Wl,-export-dynamic
 
@@ -135,6 +134,11 @@ LDFLAGS= -Wl,-export-dynamic
 CFLAGS+= -DHAVE_LIBCRYPTO
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DUSE_TCPWRAPPERS
+LIBADD+=	wrap
+.endif
+
 oid.h: tree.def Makefile
 	gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612281634.uBSGYnGb091298>