From owner-svn-src-head@freebsd.org  Sat Jan 14 10:20:39 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D3D95CA716B;
 Sat, 14 Jan 2017 10:20:39 +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 A2F6C19F1;
 Sat, 14 Jan 2017 10:20:39 +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 v0EAKc4C097483;
 Sat, 14 Jan 2017 10:20:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0EAKcrx097482;
 Sat, 14 Jan 2017 10:20:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701141020.v0EAKcrx097482@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, 14 Jan 2017 10:20:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312162 - head/usr.sbin/inetd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jan 2017 10:20:39 -0000

Author: ngie
Date: Sat Jan 14 10:20:38 2017
New Revision: 312162
URL: https://svnweb.freebsd.org/changeset/base/312162

Log:
  Fix up r312105
  
  - Only #include tcpd.h when LIBWRAP is true to avoid header include errors
  - Only define whichaf when LIBWRAP is true to avoid -Wunused warning and
    to avoid issues with structs being defined that should only be defined
    when tcpd.h is included.
  
  MFC after:	2 weeks
  X-MFC with:	r312105
  Pointyhat to:	ngie
  Reported by:	gcc tinderbox
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.sbin/inetd/inetd.c

Modified: head/usr.sbin/inetd/inetd.c
==============================================================================
--- head/usr.sbin/inetd/inetd.c	Sat Jan 14 10:20:27 2017	(r312161)
+++ head/usr.sbin/inetd/inetd.c	Sat Jan 14 10:20:38 2017	(r312162)
@@ -138,7 +138,9 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <sysexits.h>
 #include <syslog.h>
+#ifdef LIBWRAP
 #include <tcpd.h>
+#endif
 #include <unistd.h>
 
 #include "inetd.h"
@@ -307,6 +309,7 @@ getvalue(const char *arg, int *value, co
 	return 0;				/* success */
 }
 
+#ifdef LIBWRAP
 static sa_family_t
 whichaf(struct request_info *req)
 {
@@ -322,6 +325,7 @@ whichaf(struct request_info *req)
 #endif
 	return sa->sa_family;
 }
+#endif
 
 int
 main(int argc, char **argv)