Attachment #216737 for bug #248088




	fi
	${ipfilter_program:-/sbin/ipf} -Fa
	if [ -r "${ipfilter_rules}" ]; then
		${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
		    ${ipfilter_program:-/sbin/ipf} \
			-f "${ipfilter_rules}" ${ipfilter_flags}
	fi
	if [ -r "${ipv6_ipfilter_rules}" ]; then
		${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
		    ${ipfilter_program:-/sbin/ipf} -6 \
			-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
	fi
}



	${ipfilter_program:-/sbin/ipf} -I -Fa
	if [ -r "${ipfilter_rules}" ]; then
		${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
		    ${ipfilter_program:-/sbin/ipf} -I \
			-f "${ipfilter_rules}" ${ipfilter_flags}
		if [ $? -ne 0 ]; then
			err 1 'Load of rules into alternate set failed; aborting reload'
		fi
	fi
	if [ -r "${ipv6_ipfilter_rules}" ]; then
		${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
		    ${ipfilter_program:-/sbin/ipf} -I -6 \
			-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
		if [ $? -ne 0 ]; then
			err 1 'Load of IPv6 rules into alternate set failed; aborting reload'
		fi

Lines 23-29 required_modules="ipl:ipfilter" Link Here

(-)b/libexec/rc/rc.d/ipnat (-1 / +2 lines)
23	ipnat_start()	23	ipnat_start()
24	{	24	{
25	echo "Installing NAT rules."	25	echo "Installing NAT rules."
26	${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}	26	${ipnat_predefined:+env IPNAT_PREDEFINED="$ipnat_predefined"} \
		27	${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
27	}	28	}
28		29
29	run_rc_command "$1"	30	run_rc_command "$1"

Return to bug 248088

Lines 35-46 ipfilter_start() Link Here

(-)b/libexec/rc/rc.d/ipfilter (-8 / +12 lines)
35	fi	35	fi
36	${ipfilter_program:-/sbin/ipf} -Fa	36	${ipfilter_program:-/sbin/ipf} -Fa
37	if [ -r "${ipfilter_rules}" ]; then	37	if [ -r "${ipfilter_rules}" ]; then
38	${ipfilter_program:-/sbin/ipf} \	38	${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
39	-f "${ipfilter_rules}" ${ipfilter_flags}	39	${ipfilter_program:-/sbin/ipf} \
		40	-f "${ipfilter_rules}" ${ipfilter_flags}
40	fi	41	fi
41	if [ -r "${ipv6_ipfilter_rules}" ]; then	42	if [ -r "${ipv6_ipfilter_rules}" ]; then
42	${ipfilter_program:-/sbin/ipf} -6 \	43	${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
43	-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}	44	${ipfilter_program:-/sbin/ipf} -6 \
		45	-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
44	fi	46	fi
45	}	47	}
46		48
Lines 60-74 ipfilter_reload() Link Here
60		62
61	${ipfilter_program:-/sbin/ipf} -I -Fa	63	${ipfilter_program:-/sbin/ipf} -I -Fa
62	if [ -r "${ipfilter_rules}" ]; then	64	if [ -r "${ipfilter_rules}" ]; then
63	${ipfilter_program:-/sbin/ipf} -I \	65	${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
64	-f "${ipfilter_rules}" ${ipfilter_flags}	66	${ipfilter_program:-/sbin/ipf} -I \
		67	-f "${ipfilter_rules}" ${ipfilter_flags}
65	if [ $? -ne 0 ]; then	68	if [ $? -ne 0 ]; then
66	err 1 'Load of rules into alternate set failed; aborting reload'	69	err 1 'Load of rules into alternate set failed; aborting reload'
67	fi	70	fi
68	fi	71	fi
69	if [ -r "${ipv6_ipfilter_rules}" ]; then	72	if [ -r "${ipv6_ipfilter_rules}" ]; then
70	${ipfilter_program:-/sbin/ipf} -I -6 \	73	${ipf_predefined:+env IPF_PREDEFINED="$ipf_predefined"} \
71	-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}	74	${ipfilter_program:-/sbin/ipf} -I -6 \
		75	-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
72	if [ $? -ne 0 ]; then	76	if [ $? -ne 0 ]; then
73	err 1 'Load of IPv6 rules into alternate set failed; aborting reload'	77	err 1 'Load of IPv6 rules into alternate set failed; aborting reload'
74	fi	78	fi