Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/rc.d/ipfilter,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -p -r1.10.4.1 -r1.10.4.2
--- src/etc/rc.d/ipfilter	2004/09/21 15:14:20	1.10.4.1
+++ src/etc/rc.d/ipfilter	2004/11/12 06:44:17	1.10.4.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipfilter,v 1.10.4.1 2004/09/21 15:14:20 tron Exp $
+# $NetBSD: ipfilter,v 1.10.4.2 2004/11/12 06:44:17 jmc Exp $
 #
 
 # PROVIDE: ipfilter
@@ -43,12 +43,14 @@ ipfilter_prestart()
 ipfilter_start()
 {
 	echo "Enabling ipfilter."
-	/sbin/ipf -E -Fa
+	/sbin/ipf -E
+	/sbin/ipf -Fa
+	/sbin/ipf -6 -Fa
 	if [ -f /etc/ipf.conf ]; then
-		/sbin/ipf -Fa -f /etc/ipf.conf
+		/sbin/ipf -f /etc/ipf.conf
 	fi
 	if [ -f /etc/ipf6.conf ]; then
-		/sbin/ipf -6 -Fa -f /etc/ipf6.conf
+		/sbin/ipf -6 -f /etc/ipf6.conf
 	fi
 }
 
@@ -62,10 +64,12 @@ ipfilter_reload()
 {
 	echo "Reloading ipfilter rules."
 
-	if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -Fa -f /etc/ipf.conf; then
+	/sbin/ipf -I -Fa
+	/sbin/ipf -6 -I -Fa
+	if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -f /etc/ipf.conf; then
 		err 1 "reload of ipf.conf failed; not swapping to new ruleset."
 	fi
-	if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -6 -I -Fa -f /etc/ipf6.conf; then
+	if [ -f /etc/ipf6.conf ] && ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
 		err 1 "reload of ipf6.conf failed; not swapping to new ruleset."
 	fi
 	/sbin/ipf -s