extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-18 23:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Shorewall6 compilation issues

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9552 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-02-27 01:13:39 +00:00
parent c61a82b7aa
commit dccbc5a283
2 changed files with 7 additions and 6 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{SHAREDIR} . '/prog.header'; copy $globals{SHAREDIRPL} . '/prog.header';
} else { } else {
copy $globals{SHAREDIR} . '/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{SHAREDIR} . '/prog.footer'; copy $globals{SHAREDIRPL} . '/prog.footer';
} else { } else {
copy $globals{SHAREDIR} . '/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{SHAREDIR} . '/prog.functions'; copy $globals{SHAREDIRPL} . '/prog.functions';
} else { } else {
copy $globals{SHAREDIR} . '/prog.functions6'; copy $globals{SHAREDIRPL} . '/prog.functions6';
} }
} }

1
Shorewall/Shorewall/Config.pm
View File

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