Fix double spacing of 'add_file' output

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5894 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-04-10 22:52:45 +00:00
parent ed2aa2e302
commit 1530f42411
3 changed files with 8 additions and 7 deletions

View File

@ -273,6 +273,7 @@ sub add_file( $$ ) {
add_command $chainref, '';
while ( $line = <EF> ) {
chomp $line;
add_command $chainref, $line;
}

View File

@ -491,8 +491,6 @@ sub add_common_rules() {
new_standard_chain output_chain( $interface );
}
add_file $filter_table->{INPUT}, 'initdone';
setup_blacklist;
$list = find_hosts_by_option 'nosmurfs';
@ -856,7 +854,7 @@ sub process_macro ( $$$$$$$$$$$ ) {
}
#
# Once a rule has been completely resolved by macro expansion, it is processed by this function.
# Once a rule has been completely resolved by macro expansion and wildcard (source and/or dest zone == 'all'), it is processed by this function.
#
sub process_rule1 ( $$$$$$$$$ ) {
my ( $target, $source, $dest, $proto, $ports, $sports, $origdest, $ratelimit, $user ) = @_;

View File

@ -84,11 +84,10 @@ e) Because the compiler is now written in Perl, your compile-time
f) The 'refresh' command is now synonymous with 'restart'.
g) Some run-time scripts will need to be converted to write their
g) Some run-time scripts will need to be changed to write their
iptables commands to file descriptor 3 in iptables-restore format
rather than running those commands.
initdone
maclog
Details to follow.
@ -96,8 +95,11 @@ g) Some run-time scripts will need to be converted to write their
Some run-time scripts are simply eliminated because they no longer
make any sense under Shorewall-perl:
continue - Under Shorewall-perl, nothing is done between
'continue' and 'initdone'
initdone - The these two scripts assumed a model where the
continue chains were built in parallel. In the
iptables-restore model, chains are built serially
within tables and tables are build serially.
refresh - The 'refresh' command is the same as 'restart'
refreshed