extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 11:41:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore SHAREDIRPL to it's 4.2 value

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9571 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-01 18:09:38 +00:00
parent 3f961c5b19
commit c6f1cb605d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Shorewall/Shorewall/Compiler.pm
View File

@ -90,9 +90,9 @@ sub generate_script_1() {
} else { } else {
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#"; emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#";
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIRPL} . '/prog.header'; copy $globals{SHAREDIRPL} . 'prog.header';
} else { } else {
copy $globals{SHAREDIRPL} . '/prog.header6'; copy $globals{SHAREDIRPL} . 'prog.header6';
} }
} }
@ -790,9 +790,9 @@ EOF
unless ( $test ) { unless ( $test ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIRPL} . '/prog.footer'; copy $globals{SHAREDIRPL} . 'prog.footer';
} else { } else {
copy $globals{SHAREDIRPL} . '/prog.footer6'; copy $globals{SHAREDIRPL} . 'prog.footer6';
} }
} }
} }
@ -944,9 +944,9 @@ sub compiler {
unless ( $command eq 'check' ) { unless ( $command eq 'check' ) {
unless ( $test ) { unless ( $test ) {
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIRPL} . '/prog.functions'; copy $globals{SHAREDIRPL} . 'prog.functions';
} else { } else {
copy $globals{SHAREDIRPL} . '/prog.functions6'; copy $globals{SHAREDIRPL} . 'prog.functions6';
} }
} }

2
Shorewall/Shorewall/Config.pm
View File

@ -310,7 +310,7 @@ sub initialize( $ ) {
# Misc Globals # Misc Globals
# #
%globals = ( SHAREDIR => '/usr/share/shorewall' , %globals = ( SHAREDIR => '/usr/share/shorewall' ,
SHAREDIRPL => '/usr/share/shorewall' , SHAREDIRPL => '/usr/share/shorewall/' ,
CONFDIR => '/etc/shorewall', CONFDIR => '/etc/shorewall',
ORIGINAL_POLICY_MATCH => '', ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '', LOGPARMS => '',