resolve conflicts from import

svn path=/head/; revision=95424

contrib/ipfilter/ipsend/ipsend.c

@@ -32,7 +32,6 @@
 #include <netinet/ip_var.h>
 #endif
 #include "ipsend.h"
-#include "ipf.h"
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipsend.c	1.5 12/10/95 (C)1995 Darren Reed";

contrib/ipfilter/man/ipmon.8

@@ -47,7 +47,8 @@ long).
 4. The group and rule number of the rule, e.g., \fB@0:17\fP. These can be
 viewed with \fBipfstat -n\fP.
 .LP
-5. The action: \fBp\fP for passed or \fBb\fP for blocked.
+5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fB\fP for a short
+packet, \fBn\fP did not match any rules or \fBL\fP for a log rule.
 .LP
 6. The addresses.
 This is actually three fields: the source address and port

contrib/ipfilter/test/logtest

@@ -23,15 +23,15 @@ echo "$1...";
 		/bin/rm -f logout
 		exit 1
 	fi
-	TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1
+	TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
         echo "--------" >> results/$1
-	TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b
+	TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
         echo "--------" >> results/$1.b
 done ) < regress/$1
 ../ipftest -br regress/$1 -Hi input/$1 -l logout > /dev/null
-TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1
+TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1
 echo "--------" >> results/$1
-TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b
+TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b
 echo "--------" >> results/$1.b
 
 cmp expected/$1 results/$1