Page MenuHomeFreeBSD
Files F161283336

D28615.id.diff
No OneTemporary
Actions

D28615.id.diff
View Options

diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -546,9 +546,6 @@
stf_interface_ipv6_slaid="0000" # IPv6 Site Level Aggregator for stf0
ipv6_ipv4mapping="NO" # Set to "YES" to enable IPv4 mapped IPv6 addr
# communication. (like ::ffff:a.b.c.d)
-ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter,
- # see /usr/src/contrib/ipfilter/rules
- # for examples
ip6addrctl_enable="YES" # Set to YES to enable default address selection
ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages
ip6addrctl_policy="AUTO" # A pre-defined address selection policy
diff --git a/libexec/rc/rc.d/ipfilter b/libexec/rc/rc.d/ipfilter
--- a/libexec/rc/rc.d/ipfilter
+++ b/libexec/rc/rc.d/ipfilter
@@ -14,7 +14,7 @@
desc="IP packet filter"
rcvar="ipfilter_enable"
load_rc_config $name
-stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}"
+stop_precmd="test -f ${ipfilter_rules}"
start_precmd="$stop_precmd"
start_cmd="ipfilter_start"
@@ -39,10 +39,6 @@
${ipfilter_program:-/sbin/ipf} \
-f "${ipfilter_rules}" ${ipfilter_flags}
fi
- if [ -r "${ipv6_ipfilter_rules}" ]; then
- ${ipfilter_program:-/sbin/ipf} -6 \
- -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
- fi
}
ipfilter_stop()
@@ -67,13 +63,6 @@
err 1 'Load of rules into alternate set failed; aborting reload'
fi
fi
- if [ -r "${ipv6_ipfilter_rules}" ]; then
- ${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
- fi
${ipfilter_program:-/sbin/ipf} -s
}

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 3, 10:33 AM (13 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34620394
Default Alt Text
D28615.id.diff (1 KB)

Event Timeline