extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-27 10:03:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ACCEPT- silliness; fix IPSET capability detection

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6156 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-30 16:29:19 +00:00
parent e596c92d74
commit 0b996cb556
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Shorewall-perl/Shorewall/Chains.pm
View File

@ -197,7 +197,6 @@ use constant { STANDARD => 1, #defined by Netfilter
# #
our %targets = ('ACCEPT' => STANDARD, our %targets = ('ACCEPT' => STANDARD,
'ACCEPT+' => STANDARD + NONAT, 'ACCEPT+' => STANDARD + NONAT,
'ACCEPT-' => STANDARD,
'ACCEPT!' => STANDARD, 'ACCEPT!' => STANDARD,
'NONAT' => STANDARD + NONAT + NATONLY, 'NONAT' => STANDARD + NONAT + NATONLY,
'DROP' => STANDARD, 'DROP' => STANDARD,

2
Shorewall-perl/Shorewall/Config.pm
View File

@ -711,7 +711,7 @@ sub determine_capabilities() {
if ( mywhich 'ipset' ) { if ( mywhich 'ipset' ) {
qt( "ipset -X fooX1234" ); qt( "ipset -X fooX1234" );
if ( qt( "ipset -N fooX1234" ) ) { if ( qt( "ipset -N fooX1234 iphash" ) ) {
if ( qt( "$iptables -A fooX1234 -m set --set fooX1234 src -j ACCEPT" ) ) { if ( qt( "$iptables -A fooX1234 -m set --set fooX1234 src -j ACCEPT" ) ) {
qt( "$iptables -D fooX1234 -m set --set fooX1234 src -j ACCEPT" ); qt( "$iptables -D fooX1234 -m set --set fooX1234 src -j ACCEPT" );
$capabilities{IPSET_MATCH} = 1; $capabilities{IPSET_MATCH} = 1;

10
manpages/shorewall-rules.xml
View File

@ -309,16 +309,6 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">ACCEPT-</emphasis></term>
<listitem>
<para>like ACCEPT but exempts the rule from being suppressed
by OPTIMIZE=1 in <ulink
url="shorewall.conf.html">shorewall.conf</ulink>(5).</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">LOG</emphasis></term> <term><emphasis role="bold">LOG</emphasis></term>