[Midnightbsd-cvs] src [11159] trunk/contrib/pf/pflogd: sync

[laffer1 at midnightbsd.org]

Revision: 11159
          http://svnweb.midnightbsd.org/src/?rev=11159
Author:   laffer1
Date:     2018-06-27 08:57:24 -0400 (Wed, 27 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/contrib/pf/pflogd/pflogd.8
    trunk/contrib/pf/pflogd/pflogd.c
    trunk/contrib/pf/pflogd/pflogd.h
    trunk/contrib/pf/pflogd/pidfile.c
    trunk/contrib/pf/pflogd/privsep_fdpass.c

Modified: trunk/contrib/pf/pflogd/pflogd.8
===================================================================
--- trunk/contrib/pf/pflogd/pflogd.8	2018-06-27 12:56:35 UTC (rev 11158)
+++ trunk/contrib/pf/pflogd/pflogd.8	2018-06-27 12:57:24 UTC (rev 11159)
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/contrib/pf/pflogd/pflogd.8 285162 2015-07-05 14:17:57Z wblock $
 .\"
 .Dd October 22 2008
 .Dt PFLOGD 8
@@ -125,9 +125,11 @@
 .Nm
 will use
 .Ar pflog0 .
+.It Fl p Ar pidfile
 Writes a file containing the process ID of the program to
 .Pa /var/run .
 The file name has the form
+.Ao Ar pidfile Ac Ns .pid .
 The default is
 .Ar pflogd .
 .It Fl s Ar snaplen

Modified: trunk/contrib/pf/pflogd/pflogd.c
===================================================================
--- trunk/contrib/pf/pflogd/pflogd.c	2018-06-27 12:56:35 UTC (rev 11158)
+++ trunk/contrib/pf/pflogd/pflogd.c	2018-06-27 12:57:24 UTC (rev 11159)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$OpenBSD: pflogd.c,v 1.46 2008/10/22 08:16:49 henning Exp $	*/
 
 /*
@@ -31,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/contrib/pf/pflogd/pflogd.c 293110 2016-01-03 17:23:16Z dim $");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -766,7 +767,7 @@
 		np = pcap_dispatch(hpcap, PCAP_NUM_PKTS,
 		    phandler, (u_char *)dpcap);
 		if (np < 0) {
-			if (!if_exists(interface) == -1) {
+			if (!if_exists(interface)) {
 				logmsg(LOG_NOTICE, "interface %s went away",
 				    interface);
 				ret = -1;

Modified: trunk/contrib/pf/pflogd/pflogd.h
===================================================================
--- trunk/contrib/pf/pflogd/pflogd.h	2018-06-27 12:56:35 UTC (rev 11158)
+++ trunk/contrib/pf/pflogd/pflogd.h	2018-06-27 12:57:24 UTC (rev 11159)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$OpenBSD: pflogd.h,v 1.3 2006/01/15 16:38:04 canacar Exp $ */
 
 /*

Modified: trunk/contrib/pf/pflogd/pidfile.c
===================================================================
--- trunk/contrib/pf/pflogd/pidfile.c	2018-06-27 12:56:35 UTC (rev 11158)
+++ trunk/contrib/pf/pflogd/pidfile.c	2018-06-27 12:57:24 UTC (rev 11159)
@@ -1,4 +1,5 @@
-/*	$MidnightBSD$ */
+/* $MidnightBSD$ */
+/*	$FreeBSD: stable/10/contrib/pf/pflogd/pidfile.c 263687 2014-03-24 13:48:04Z emaste $ */
 /*	$OpenBSD: pidfile.c,v 1.5 2002/05/26 09:29:02 deraadt Exp $	*/
 /*	$NetBSD: pidfile.c,v 1.4 2001/02/19 22:43:42 cgd Exp $	*/
 
@@ -17,13 +18,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: trunk/contrib/pf/pflogd/privsep_fdpass.c
===================================================================
--- trunk/contrib/pf/pflogd/privsep_fdpass.c	2018-06-27 12:56:35 UTC (rev 11158)
+++ trunk/contrib/pf/pflogd/privsep_fdpass.c	2018-06-27 12:57:24 UTC (rev 11159)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$OpenBSD: privsep_fdpass.c,v 1.5 2008/03/24 16:11:08 deraadt Exp $	*/
 
 /*