Merge branch '4.5.14' of ssh://git.code.sf.net/p/shorewall/code

This commit is contained in:
Tom Eastep 2013-03-08 08:00:43 -08:00
commit 4586568649
2 changed files with 2 additions and 1 deletions

View File

@ -4376,7 +4376,7 @@ sub do_iproto( $$$ )
} }
$ports = validate_port_list $pname , $ports; $ports = validate_port_list $pname , $ports;
push @output, multiport => ( $srcndst ? "-m multiport ${invert}--ports ${ports} " : "-m multiport ${invert}--dports ${ports} " ); push @output, multiport => ( $srcndst ? "${invert}--ports ${ports} " : "${invert}--dports ${ports} " );
$multiport = 1; $multiport = 1;
} else { } else {
fatal_error "Missing DEST PORT" unless supplied $ports; fatal_error "Missing DEST PORT" unless supplied $ports;

View File

@ -228,6 +228,7 @@ sub copy_and_edit_table( $$$$ ) {
# #
for ( split ',', $copy ) { for ( split ',', $copy ) {
unless ( $copied{$_} ) { unless ( $copied{$_} ) {
fatal_error "Unknown interface ($_)" unless known_interface($_);
push @copy, $_; push @copy, $_;
$copied{$_} = 1; $copied{$_} = 1;
} }