Correct install fix

- Also remove extra logic from action.Broadcast

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-14 14:39:25 -07:00
parent 6407520a35
commit 158f6305b1
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 4 additions and 6 deletions

View File

@ -51,8 +51,6 @@ DEFAULTS DROP,-
add_commands $chainref, 'for address in $ALL_BCASTS; do'; add_commands $chainref, 'for address in $ALL_BCASTS; do';
} elsif ($family == F_IPV6 ) { } elsif ($family == F_IPV6 ) {
add_commands $chainref, 'for address in $ALL_ACASTS; do'; add_commands $chainref, 'for address in $ALL_ACASTS; do';
} else {
fatal_error "Internal error - \$family == $family";
} }
incr_cmd_level $chainref; incr_cmd_level $chainref;

View File

@ -446,10 +446,10 @@ if [ -z "$first_install" ]; then
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_AllowICMPs delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_AllowICMPs
else else
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_AllowICMPs delete_file ${DESTDIR}${SHAREDIR}/shorewall6/action.A_AllowICMPs
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.AllowICMPs delete_file ${DESTDIR}${SHAREDIR}/shorewall6/action.AllowICMPs
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Broadcast delete_file ${DESTDIR}${SHAREDIR}/shorewall6/action.Broadcast
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Multicast delete_file ${DESTDIR}${SHAREDIR}/shorewall6/action.Multicast
fi fi
fi fi