From owner-svn-src-stable-10@freebsd.org  Sat Feb  4 16:00:52 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97252CD0E70;
 Sat,  4 Feb 2017 16:00:52 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A1531E7D;
 Sat,  4 Feb 2017 16:00:52 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v14G0pxO055549;
 Sat, 4 Feb 2017 16:00:51 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v14G0pIW055547;
 Sat, 4 Feb 2017 16:00:51 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702041600.v14G0pIW055547@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 4 Feb 2017 16:00:51 +0000 (UTC)
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
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2017 16:00:52 -0000

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