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

Rename USE_LOCAL_MODULES to EXPORTMODULES

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-02-06 08:42:35 -08:00
parent a82d2e5101
commit 1100d2b894
15 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Samples/Universal/shorewall.conf
View File

@ -194,7 +194,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=Yes COMPLETE=Yes
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples/one-interface/shorewall.conf
View File

@ -205,7 +205,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples/three-interfaces/shorewall.conf
View File

@ -205,7 +205,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples/two-interfaces/shorewall.conf
View File

@ -212,7 +212,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples6/Universal/shorewall6.conf
View File

@ -157,7 +157,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=Yes COMPLETE=Yes
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples6/one-interface/shorewall6.conf
View File

@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################## ##############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples6/three-interfaces/shorewall6.conf
View File

@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Samples6/two-interfaces/shorewall6.conf
View File

@ -159,7 +159,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -336,10 +336,10 @@ sub generate_script_3($) {
save_progress_message 'Initializing...'; save_progress_message 'Initializing...';
if ( $export || $config{USE_LOCAL_MODULES} ) { if ( $export || $config{EXPORTMODULES} ) {
my $fn = find_file( $config{LOAD_HELPERS_ONLY} ? 'helpers' : 'modules' ); my $fn = find_file( $config{LOAD_HELPERS_ONLY} ? 'helpers' : 'modules' );
if ( -f $fn && ( $config{USE_LOCAL_MODULES} || ( $export && ! $fn =~ "^$globals{SHAREDIR}/" ) ) ) { if ( -f $fn && ( $config{EXPORTMODULES} || ( $export && ! $fn =~ "^$globals{SHAREDIR}/" ) ) ) {
emit 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir'; emit 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir';
emit 'cat > ${VARDIR}/.modules << EOF'; emit 'cat > ${VARDIR}/.modules << EOF';
open_file $fn; open_file $fn;

4
Shorewall/Perl/Shorewall/Config.pm
View File

@ -484,7 +484,7 @@ sub initialize( $ ) {
REQUIRE_INTERFACE => undef, REQUIRE_INTERFACE => undef,
FORWARD_CLEAR_MARK => undef, FORWARD_CLEAR_MARK => undef,
COMPLETE => undef, COMPLETE => undef,
USE_LOCAL_MODULES => undef, EXPORTMODULES => undef,
# #
# Packet Disposition # Packet Disposition
# #
@ -3221,7 +3221,7 @@ sub get_configuration( $ ) {
default_yes_no 'REQUIRE_INTERFACE' , ''; default_yes_no 'REQUIRE_INTERFACE' , '';
default_yes_no 'FORWARD_CLEAR_MARK' , have_capability 'MARK' ? 'Yes' : ''; default_yes_no 'FORWARD_CLEAR_MARK' , have_capability 'MARK' ? 'Yes' : '';
default_yes_no 'COMPLETE' , ''; default_yes_no 'COMPLETE' , '';
default_yes_no 'USE_LOCAL_MODULES' , ''; default_yes_no 'EXPORTMODULES' , '';
require_capability 'MARK' , 'FOREWARD_CLEAR_MARK=Yes', 's', if $config{FORWARD_CLEAR_MARK}; require_capability 'MARK' , 'FOREWARD_CLEAR_MARK=Yes', 's', if $config{FORWARD_CLEAR_MARK};

2
Shorewall/configfiles/shorewall.conf
View File

@ -194,7 +194,7 @@ FORWARD_CLEAR_MARK=
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

2
Shorewall6/shorewall6.conf
View File

@ -157,7 +157,7 @@ FORWARD_CLEAR_MARK=Yes
COMPLETE=No COMPLETE=No
USE_LOCAL_MODULES=Yes EXPORTMODULES=Yes
############################################################################### ###############################################################################
# P A C K E T D I S P O S I T I O N # P A C K E T D I S P O S I T I O N

4
docs/CompiledPrograms.xml
View File

@ -444,8 +444,8 @@ clean:
(<filename>modules</filename> or <filename>helpers</filename>) in the (<filename>modules</filename> or <filename>helpers</filename>) in the
firewall's configuration directory before compilation.</para> firewall's configuration directory before compilation.</para>
<para>In Shorewall 4.4.17, the USE_LOCAL_MODULES option was added to <para>In Shorewall 4.4.17, the EXPORTMODULES option was added to
shorewall.conf (and shorewall6.conf). When USE_LOCAL_MODULES=Yes, any shorewall.conf (and shorewall6.conf). When EXPORTMODULES=Yes, any
<filename>modules</filename> or <filename>helpers</filename> file <filename>modules</filename> or <filename>helpers</filename> file
found on the CONFIG_PATH on the Administrative System during found on the CONFIG_PATH on the Administrative System during
compilation will be used.</para> compilation will be used.</para>

2
manpages/shorewall.conf.xml
View File

@ -1846,7 +1846,7 @@ net all DROP info</programlisting>then the chain name is 'net2all'
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">USE_LOCAL_MODULES=</emphasis>[<emphasis <term><emphasis role="bold">EXPORTMODULES=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem> <listitem>

2
manpages6/shorewall6.conf.xml
View File

@ -1493,7 +1493,7 @@ net all DROP info</programlisting>then the chain name is 'net2all'
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">USE_LOCAL_MODULES=</emphasis>[<emphasis <term><emphasis role="bold">EXPORTMODULES=</emphasis>[<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem> <listitem>