diff --git a/New/Shorewall/Common.pm b/New/Shorewall/Common.pm index f3df667e9..0ac69b3da 100644 --- a/New/Shorewall/Common.pm +++ b/New/Shorewall/Common.pm @@ -98,6 +98,14 @@ sub fatal_error die; } +# +# Pre-process a line from a configuration file. +# +# chomp it. +# compress out redundent white space. +# ensure that it has an appropriate number of columns. +# supply '-' in omitted trailing columns. +# sub split_line( $$ ) { my ( $columns, $description ) = @_; diff --git a/New/prog.functions b/New/prog.functions index 2271fa2ef..894af6331 100644 --- a/New/prog.functions +++ b/New/prog.functions @@ -125,22 +125,6 @@ run_tc() { fi } -# -# Functions to appease unconverted extension scripts -# -save_command() -{ - return 0 -} - -run_and_save_command() { - eval $@ -} - -ensure_and_save_command() { - eval $@ || fatal_error "Command \"$@\" failed" -} - restore_dynamic_rules() { if [ -f ${VARDIR}/save ]; then progress_message2 "Setting up dynamic rules..."