Fix a couple of more bugs (one serious)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9052 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-14 19:49:03 +00:00
parent b8deb12b00
commit a42ba57102
2 changed files with 4 additions and 4 deletions

View File

@ -248,7 +248,7 @@ sub generate_script_1() {
'result=$?',
'qt1 $IP6TABLES -F foox1234',
'qt1 $IP6TABLES -X foox1234',
'[ $result = 0 ] || startup_error "Your kernel/iptables do not include state match support. No version of Shorewall6 will run on this system"',
'[ $result = 0 ] || startup_error "Your kernel/ip6tables do not include state match support. No version of Shorewall6 will run on this system"',
'' );
}
@ -272,7 +272,7 @@ EOF
' qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1' );
} else {
emit( ' deletechain() {',
' qt $IPTABLES -L $1 -n && qt $IPTABLES -F $1 && qt $IPTABLES -X $1' );
' qt $IP6TABLES -L $1 -n && qt $IP6TABLES -F $1 && qt $IP6TABLES -X $1' );
}
emit <<'EOF';

View File

@ -391,7 +391,7 @@ sub zone_report()
if ( $family == F_IPV4 ) {
progress_message_nocompress " $interface:$grouplist";
} else {
progress_message_nocompress " $interface:\[$grouplist\]";
progress_message_nocompress " $interface:<$grouplist>";
}
$printed = 1;
}
@ -450,7 +450,7 @@ sub dump_zone_contents()
if ( $family == F_IPV4 ) {
$entry .= " $interface:$grouplist";
} else {
$entry .= " $interface:\[$grouplist\]";
$entry .= " $interface:<$grouplist>";
}
}
}