Date: Sat, 4 Feb 2017 16:00:51 +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-10@freebsd.org Subject: svn commit: r313212 - in stable/10/usr.sbin/amd: amd include Message-ID: <201702041600.v14G0pIW055547@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Feb 4 16:00:51 2017 New Revision: 313212 URL: https://svnweb.freebsd.org/changeset/base/313212 Log: MFC r311472: Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of always building support into amd(8). Modified: stable/10/usr.sbin/amd/amd/Makefile stable/10/usr.sbin/amd/include/config.h Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/amd/amd/Makefile ============================================================================== --- stable/10/usr.sbin/amd/amd/Makefile Sat Feb 4 16:00:19 2017 (r313211) +++ stable/10/usr.sbin/amd/amd/Makefile Sat Feb 4 16:00:51 2017 (r313212) @@ -30,8 +30,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/a -I${SRCTOP}/contrib/amd/include \ -I${.OBJDIR}/../../../include/rpcsvc -DPADD= ${LIBAMU} ${LIBWRAP} -LDADD= ${LIBAMU} -lwrap +DPADD= ${LIBAMU} +LDADD= ${LIBAMU} SRCS+= conf_parse.c conf_parse.h conf_tok.c SRCS+= sun_map_parse.c sun_map_parse.h sun_map_tok.c @@ -74,4 +74,10 @@ CFLAGS+= -DHAVE_MAP_HESIOD SRCS+= info_nis.c .endif +.if ${MK_TCP_WRAPPERS} != "no" +CFLAGS+= -DHAVE_LIBWRAP -DHAVE_TCPD_H +DPADD+= ${LIBWRAP} +LDADD+= -lwrap +.endif + .include <bsd.prog.mk> Modified: stable/10/usr.sbin/amd/include/config.h ============================================================================== --- stable/10/usr.sbin/amd/include/config.h Sat Feb 4 16:00:19 2017 (r313211) +++ stable/10/usr.sbin/amd/include/config.h Sat Feb 4 16:00:51 2017 (r313212) @@ -530,7 +530,7 @@ /* #undef HAVE_LIBRT */ /* does libwrap exist? */ -#define HAVE_LIBWRAP 1 +/* #undef HAVE_LIBWRAP */ /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 @@ -1207,7 +1207,7 @@ #define HAVE_SYS_WAIT_H 1 /* Define to 1 if you have the <tcpd.h> header file. */ -#define HAVE_TCPD_H 1 +/* #undef HAVE_TCPD_H */ /* Define to 1 if you have the <time.h> header file. */ #define HAVE_TIME_H 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702041600.v14G0pIW055547>