holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch '5.1.3'

Browse Source 
Conflicts:
	Shorewall/Perl/Shorewall/Config.pm
	Shorewall6/Actions/action.Multicast
This commit is contained in:
Tom Eastep 2017-03-14 14:16:47 -07:00
commit 5b85627fb8
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Config.pm
View File

@ -748,7 +748,7 @@ sub initialize( $;$$) {
TC_SCRIPT => '', TC_SCRIPT => '',
EXPORT => 0, EXPORT => 0,
KLUDGEFREE => '', KLUDGEFREE => '',
VERSION => "5.1.4-Beta1", VERSION => "5.1.3",
CAPVERSION => 50100 , CAPVERSION => 50100 ,
BLACKLIST_LOG_TAG => '', BLACKLIST_LOG_TAG => '',
RELATED_LOG_TAG => '', RELATED_LOG_TAG => '',
@ -3772,8 +3772,6 @@ sub read_a_line($) {
while ( <$currentfile> ) { while ( <$currentfile> ) {
chomp; chomp;
$currentlinenumber = $. unless $currentlinenumber;
# #
# Handle directives # Handle directives
# #
@ -3787,6 +3785,8 @@ sub read_a_line($) {
$directive_callback->( 'OMITTED', $_ ) if ( $directive_callback ); $directive_callback->( 'OMITTED', $_ ) if ( $directive_callback );
next; next;
} }
$currentlinenumber = $. unless $currentlinenumber;
# #
# Suppress leading whitespace in certain continuation lines # Suppress leading whitespace in certain continuation lines
# #

2
Shorewall/install.sh
View File

@ -442,6 +442,8 @@ 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.Drop delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Drop
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Reject delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.Reject
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Drop
delete_file ${DESTDIR}${SHAREDIR}/shorewall/action.A_Reject
fi fi
fi fi