mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-18 23:57:14 +02:00
Fix Shorewall6 compilation issues
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9552 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
c61a82b7aa
commit
dccbc5a283
@ -90,9 +90,9 @@ sub generate_script_1() {
|
||||
} else {
|
||||
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#";
|
||||
if ( $family == F_IPV4 ) {
|
||||
copy $globals{SHAREDIR} . '/prog.header';
|
||||
copy $globals{SHAREDIRPL} . '/prog.header';
|
||||
} else {
|
||||
copy $globals{SHAREDIR} . '/prog.header6';
|
||||
copy $globals{SHAREDIRPL} . '/prog.header6';
|
||||
}
|
||||
}
|
||||
|
||||
@ -790,9 +790,9 @@ EOF
|
||||
|
||||
unless ( $test ) {
|
||||
if ( $family == F_IPV4 ) {
|
||||
copy $globals{SHAREDIR} . '/prog.footer';
|
||||
copy $globals{SHAREDIRPL} . '/prog.footer';
|
||||
} else {
|
||||
copy $globals{SHAREDIR} . '/prog.footer6';
|
||||
copy $globals{SHAREDIRPL} . '/prog.footer6';
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -944,9 +944,9 @@ sub compiler {
|
||||
unless ( $command eq 'check' ) {
|
||||
unless ( $test ) {
|
||||
if ( $family == F_IPV4 ) {
|
||||
copy $globals{SHAREDIR} . '/prog.functions';
|
||||
copy $globals{SHAREDIRPL} . '/prog.functions';
|
||||
} else {
|
||||
copy $globals{SHAREDIR} . '/prog.functions6';
|
||||
copy $globals{SHAREDIRPL} . '/prog.functions6';
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -310,6 +310,7 @@ sub initialize( $ ) {
|
||||
# Misc Globals
|
||||
#
|
||||
%globals = ( SHAREDIR => '/usr/share/shorewall' ,
|
||||
SHAREDIRPL => '/usr/share/shorewall' ,
|
||||
CONFDIR => '/etc/shorewall',
|
||||
ORIGINAL_POLICY_MATCH => '',
|
||||
LOGPARMS => '',
|
||||
|
Loading…
x
Reference in New Issue
Block a user