extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 14:20:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

A few more fixes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8963 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-09 23:12:56 +00:00
parent 7377eb1993
commit c2ac63b900
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-perl/Shorewall/Compiler.pm
View File

@ -980,7 +980,7 @@ sub compiler {
#
# MACLIST Filtration
#
setup_mac_lists 1;
setup_mac_lists 1 if $family == F_IPV4;
#
# Process the rules file.
#
@ -997,7 +997,7 @@ sub compiler {
#
# MACLIST Filtration again
#
setup_mac_lists 2;
setup_mac_lists 2 if $family == F_IPV4;
#
# Apply Policies
#

8
Shorewall-perl/Shorewall/Config.pm
View File

@ -422,9 +422,7 @@ sub initialize( $ ) {
LOGBURST => undef,
LOGALLNEW => undef,
BLACKLIST_LOGLEVEL => undef,
MACLIST_LOG_LEVEL => undef,
TCP_FLAGS_LOG_LEVEL => undef,
SMURF_LOG_LEVEL => undef,
LOG_VERBOSITY => undef,
STARTUP_LOG => undef,
#
@ -460,7 +458,6 @@ sub initialize( $ ) {
#
# Firewall Options
#
IP_FORWARDING => undef,
TC_ENABLED => undef,
TC_EXPERT => undef,
CLEAR_TC => undef,
@ -470,15 +467,12 @@ sub initialize( $ ) {
ADMINISABSENTMINDED => undef,
BLACKLISTNEWONLY => undef,
MODULE_SUFFIX => undef,
MACLIST_TABLE => undef,
MACLIST_TTL => undef,
MAPOLDACTIONS => '',
FASTACCEPT => undef,
IMPLICIT_CONTINUE => undef,
HIGH_ROUTE_MARKS => undef,
OPTIMIZE => undef,
EXPORTPARAMS => undef,
SHOREWALL_COMPILER => undef,
EXPAND_POLICIES => undef,
KEEP_RT_TABLES => undef,
DELETE_THEN_ADD => undef,
@ -486,12 +480,10 @@ sub initialize( $ ) {
DONT_LOAD => '',
AUTO_COMMENT => undef,
MANGLE_ENABLED => undef ,
NULL_ROUTE_RFC1918 => undef ,
USE_DEFAULT_RT => undef ,
#
# Packet Disposition
#
MACLIST_DISPOSITION => undef,
TCP_FLAGS_DISPOSITION => undef,
BLACKLIST_DISPOSITION => undef,
);

11
Shorewall6/shorewall6
View File

@ -1592,13 +1592,14 @@ case "$COMMAND" in
start_command $@
;;
stop|clear)
if [ "x$2" = x-f ]; then
[ -x ${VARDIR}/.restore ] && FIREWALL=${VARDIR}/.restore
shift;
fi
[ $# -ne 1 ] && usage 1
get_config
if [ -x ${VARDIR}/.restore ]; then
FIREWALL=${VARDIR}/.restore
else
fatal_error "Shorewall6 has never been started"
fi
export NOROUTES
mutex_on
$SHOREWALL_SHELL $FIREWALL $debugging $nolock $COMMAND