From owner-svn-src-head@freebsd.org  Fri Jan  6 21:40:31 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 E8F57CA35F6;
 Fri,  6 Jan 2017 21:40:31 +0000 (UTC) (envelope-from dim@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 B897A13D5;
 Fri,  6 Jan 2017 21:40:31 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v06LeUsu002671;
 Fri, 6 Jan 2017 21:40:30 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v06LeUWM002670;
 Fri, 6 Jan 2017 21:40:30 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701062140.v06LeUWM002670@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 6 Jan 2017 21:40:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311556 - head/contrib/tcp_wrappers
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: Fri, 06 Jan 2017 21:40:32 -0000

Author: dim
Date: Fri Jan  6 21:40:30 2017
New Revision: 311556
URL: https://svnweb.freebsd.org/changeset/base/311556

Log:
  After r311459, some ports can break, because a few of the newly added
  prototypes in <tcpd.h> use FILE.  Pull in a minimal forward declaration
  of FILE from <stdio.h> to minimize impact.  Sorry for the breakage.
  
  Reported by:	Shawn Webb <shawn.webb@hardenedbsd.org>
  X-MFC-With:	r311459

Modified:
  head/contrib/tcp_wrappers/tcpd.h

Modified: head/contrib/tcp_wrappers/tcpd.h
==============================================================================
--- head/contrib/tcp_wrappers/tcpd.h	Fri Jan  6 21:36:51 2017	(r311555)
+++ head/contrib/tcp_wrappers/tcpd.h	Fri Jan  6 21:40:30 2017	(r311556)
@@ -12,6 +12,11 @@
 #define	TCPD_SOCKADDR struct sockaddr_in
 #endif
 
+#ifndef _STDFILE_DECLARED
+#define _STDFILE_DECLARED
+typedef struct __sFILE FILE;
+#endif
+
 /* Structure to describe one communications endpoint. */
 
 #define	STRING_LENGTH	128		/* hosts, users, processes */