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

First working Shorewall6

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8961 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-09 22:21:36 +00:00
parent 5834b574f2
commit ecb479b616
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2462,6 +2462,7 @@ sub create_netfilter_load() {
push_indent; push_indent;
my $utility = $family == F_IPV4 ? 'iptables-restore' : 'ip6tables-restore'; my $utility = $family == F_IPV4 ? 'iptables-restore' : 'ip6tables-restore';
my $UTILITY = $family == F_IPV4 ? 'IPTABLES_RESTORE' : 'IP6TABLES_RESTORE';
save_progress_message "Preparing $utility input..."; save_progress_message "Preparing $utility input...";
@ -2516,7 +2517,7 @@ sub create_netfilter_load() {
# #
emit( 'exec 3>&-', emit( 'exec 3>&-',
'', '',
'[ -n "$DEBUG" ] && command=debug_restore_input || command=$IPTABLES_RESTORE', '[ -n "$DEBUG" ] && command=debug_restore_input || command=$' . $UTILITY,
'', '',
'progress_message2 "Running $command..."', 'progress_message2 "Running $command..."',
'', '',

20
Shorewall-perl/Shorewall/Compiler.pm
View File

@ -134,12 +134,22 @@ sub generate_script_1() {
emit( '[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir' ); emit( '[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir' );
if ( $export ) { if ( $family == F_IPV4 ) {
emit ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' , if ( $export ) {
'[ -n "${VARDIR:=/var/lib/shorewall-lite}" ]' ); emit ( 'CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"' ,
'[ -n "${VARDIR:=/var/lib/shorewall-lite}" ]' );
} else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
'[ -n "${VARDIR:=/var/lib/shorewall}" ]' );
}
} else { } else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") , if ( $export ) {
'[ -n "${VARDIR:=/var/lib/shorewall}" ]' ); emit ( 'CONFIG_PATH="/etc/shorewall6-lite:/usr/share/shorewall6-lite"' ,
'[ -n "${VARDIR:=/var/lib/shorewall6-lite}" ]' );
} else {
emit ( qq(CONFIG_PATH="$config{CONFIG_PATH}") ,
'[ -n "${VARDIR:=/var/lib/shorewall6}" ]' );
}
} }
emit 'TEMPFILE='; emit 'TEMPFILE=';

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

@ -2341,7 +2341,7 @@ sub generate_aux_config() {
my $value = $config{$option}; my $value = $config{$option};
emit "[ -n \"\${$option:=$value}\" ]" if $value ne ''; emit "[ -n \"\${$option:=$value}\" ]" if defined $value && $value ne '';
} }
sub conditionally_add_option1( $ ) { sub conditionally_add_option1( $ ) {