holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix Shorewall6 capability detection

Browse Source
This commit is contained in:
Tom Eastep 2009-12-05 21:34:03 -08:00
parent 0e5293ffc5
commit acaa9ccc55
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall6-lite/shorecap
View File

@ -45,17 +45,17 @@
# used during firewall compilation, then the generated firewall program will likewise not # used during firewall compilation, then the generated firewall program will likewise not
# require Shorewall to be installed. # require Shorewall to be installed.
SHAREDIR=/usr/share/shorewall-lite SHAREDIR=/usr/share/shorewall6-lite
VARDIR=/var/lib/shorewall-lite VARDIR=/var/lib/shorewall6-lite
CONFDIR=/etc/shorewall-lite CONFDIR=/etc/shorewall6-lite
PRODUCT="Shorewall Lite" PRODUCT="Shorewall Lite"
. /usr/share/shorewall-lite/lib.base . /usr/share/shorewall6-lite/lib.base
. /usr/share/shorewall-lite/configpath . /usr/share/shorewall6-lite/configpath
[ -n "$PATH" ] || PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin [ -n "$PATH" ] || PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
VERSION=$(cat /usr/share/shorewall-lite/version) VERSION=$(cat /usr/share/shorewall6-lite/version)
[ -n "$IPTABLES" ] || IPTABLES=$(mywhich iptables) [ -n "$IPTABLES" ] || IPTABLES=$(mywhich iptables)

4
Shorewall6/lib.base
View File

@ -696,8 +696,6 @@ set_state () # $1 = state
# Determine which optional facilities are supported by iptables/netfilter # Determine which optional facilities are supported by iptables/netfilter
# #
determine_capabilities() { determine_capabilities() {
qt $IP6TABLES -t mangle -L -n && MANGLE_ENABLED=Yes || MANGLE_ENABLED=
CONNTRACK_MATCH= CONNTRACK_MATCH=
NEW_CONNTRACK_MATCH= NEW_CONNTRACK_MATCH=
OLD_CONNTRACK_MATCH= OLD_CONNTRACK_MATCH=
@ -747,6 +745,8 @@ determine_capabilities() {
exit 1 exit 1
fi fi
qt $IP6TABLES -t mangle -L -n && MANGLE_ENABLED=Yes || MANGLE_ENABLED=
qt $IP6TABLES -F $chain qt $IP6TABLES -F $chain
qt $IP6TABLES -X $chain qt $IP6TABLES -X $chain
if ! $IP6TABLES -N $chain; then if ! $IP6TABLES -N $chain; then