From e49049679f4ee5ce6bb9214122154c529a811b5e Mon Sep 17 00:00:00 2001
From: guido <guido@FreeBSD.org>
Date: Wed, 16 Aug 2006 12:23:02 +0000
Subject: Resolve conflicts

MFC after:	1 weeks
---
 contrib/ipfilter/ipsd/sbpf.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'contrib/ipfilter/ipsd/sbpf.c')

diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c
index 6d4f83d..a724ba5 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/contrib/ipfilter/ipsd/sbpf.c
@@ -11,6 +11,9 @@
 #include <ctype.h>
 #include <signal.h>
 #include <errno.h>
+#ifdef __NetBSD__
+# include <paths.h>
+#endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mbuf.h>
@@ -123,8 +126,18 @@ int	tout;
 	struct	bpf_version bv;
 	struct	timeval to;
 	struct	ifreq ifr;
+#ifdef _PATH_BPF
+	char 	*bpfname = _PATH_BPF;
+	int	fd;
+
+	if ((fd = open(bpfname, O_RDWR)) < 0)
+	    {
+		fprintf(stderr, "no bpf devices available as /dev/bpfxx\n");
+		return -1;
+	    }
+#else
 	char	bpfname[16];
-	int	fd, i;
+	int	fd = -1, i;
 
 	for (i = 0; i < 16; i++)
 	    {
@@ -137,6 +150,7 @@ int	tout;
 		fprintf(stderr, "no bpf devices available as /dev/bpfxx\n");
 		return -1;
 	    }
+#endif
 
 	if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0)
 	    {
-- 
cgit v1.1