Remove most special handling of 'Auth'.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-05-14 10:44:26 -07:00
parent a5412cff38
commit bc6a38ca64
4 changed files with 15 additions and 17 deletions

View File

@ -24,9 +24,9 @@
# #
COUNT COUNT
# #
# Reject 'auth' # Silently DROP 'auth'
# #
Auth(A_REJECT) Auth(A_DROP)
# #
# Don't log broadcasts # Don't log broadcasts
# #

View File

@ -20,10 +20,6 @@
# #
COUNT COUNT
# #
# Don't log 'auth' -- REJECT
#
Auth(A_REJECT)
#
# Drop Broadcasts so they don't clutter up the log # Drop Broadcasts so they don't clutter up the log
# (broadcasts must *not* be rejected). # (broadcasts must *not* be rejected).
# #

View File

@ -9,7 +9,7 @@
# of the action is: # of the action is:
# #
# a) Avoid logging lots of useless cruft. # a) Avoid logging lots of useless cruft.
# b) Ensure that 'auth' requests are rejected, even if the policy is # b) Allow 'auth' requests rejected rejected, even if the policy is
# DROP. Otherwise, you may experience problems establishing # DROP. Otherwise, you may experience problems establishing
# connections with servers that use auth. # connections with servers that use auth.
# c) Ensure that certain ICMP packets that are necessary for successful # c) Ensure that certain ICMP packets that are necessary for successful
@ -19,8 +19,8 @@
# #
# 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin # 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin
# actions. # actions.
# 2 - Action to take with Auth requests. Default is REJECT or A_REJECT, # 2 - Action to take with Auth requests. Default is to do nothing special
# depending on the setting of the first parameter. # with them.
# 3 - Action to take with SMB requests. Default is DROP or A_DROP, # 3 - Action to take with SMB requests. Default is DROP or A_DROP,
# depending on the setting of the first parameter. # depending on the setting of the first parameter.
# 4 - Action to take with required ICMP packets. Default is ACCEPT or # 4 - Action to take with required ICMP packets. Default is ACCEPT or
@ -43,7 +43,6 @@ my ( $p1, $p2, $p3 , $p4, $p5 ) = get_action_params( 5 );
if ( defined $p1 ) { if ( defined $p1 ) {
if ( $p1 eq 'audit' ) { if ( $p1 eq 'audit' ) {
set_action_param( 2, 'A_REJECT') unless supplied $p2;
set_action_param( 3, 'A_DROP') unless supplied $p3; set_action_param( 3, 'A_DROP') unless supplied $p3;
set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4; set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4;
set_action_param( 5, 'A_DROP' ) unless supplied $p5; set_action_param( 5, 'A_DROP' ) unless supplied $p5;
@ -56,7 +55,7 @@ if ( defined $p1 ) {
?END PERL; ?END PERL;
DEFAULTS -,REJECT,DROP,ACCEPT,DROP DEFAULTS -,-,DROP,ACCEPT,DROP
#TARGET SOURCE DEST PROTO DPORT SPORT #TARGET SOURCE DEST PROTO DPORT SPORT
# #
@ -64,9 +63,11 @@ DEFAULTS -,REJECT,DROP,ACCEPT,DROP
# #
COUNT COUNT
# #
# Reject 'auth' # Special Handling for Auth
# #
?if @2 ne '-'
Auth(@2) Auth(@2)
?endif
# #
# Don't log broadcasts # Don't log broadcasts
# #

View File

@ -16,8 +16,8 @@
# #
# 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin # 1 - 'audit' or '-'. Default is '-' which means don't audit in builtin
# actions. # actions.
# 2 - Action to take with Auth requests. Default is REJECT or A_REJECT, # 2 - Action to take with Auth requests. Default is to do nothing
# depending on the setting of the first parameter. # special with them.
# 3 - Action to take with SMB requests. Default is REJECT or A_REJECT, # 3 - Action to take with SMB requests. Default is REJECT or A_REJECT,
# depending on the setting of the first parameter. # depending on the setting of the first parameter.
# 4 - Action to take with required ICMP packets. Default is ACCEPT or # 4 - Action to take with required ICMP packets. Default is ACCEPT or
@ -39,7 +39,6 @@ my ( $p1, $p2, $p3 , $p4, $p5 ) = get_action_params( 5 );
if ( defined $p1 ) { if ( defined $p1 ) {
if ( $p1 eq 'audit' ) { if ( $p1 eq 'audit' ) {
set_action_param( 2, 'A_REJECT') unless supplied $p2;
set_action_param( 3, 'A_REJECT') unless supplied $p3; set_action_param( 3, 'A_REJECT') unless supplied $p3;
set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4; set_action_param( 4, 'A_ACCEPT' ) unless supplied $p4;
set_action_param( 5, 'A_DROP' ) unless supplied $p5; set_action_param( 5, 'A_DROP' ) unless supplied $p5;
@ -52,7 +51,7 @@ if ( defined $p1 ) {
?END PERL; ?END PERL;
DEFAULTS -,REJECT,REJECT,ACCEPT,DROP DEFAULTS -,-,REJECT,ACCEPT,DROP
#TARGET SOURCE DEST PROTO #TARGET SOURCE DEST PROTO
# #
@ -60,9 +59,11 @@ DEFAULTS -,REJECT,REJECT,ACCEPT,DROP
# #
COUNT COUNT
# #
# Don't log 'auth' -- REJECT # Special handling for Auth
# #
?if @2 ne '-'
Auth(@2) Auth(@2)
?endif
# #
# Drop Broadcasts so they don't clutter up the log # Drop Broadcasts so they don't clutter up the log
# (broadcasts must *not* be rejected). # (broadcasts must *not* be rejected).