From 0beb327f0a235abd8cfdccce30479e035f18bdcf Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 24 May 2011 11:31:42 -0700 Subject: [PATCH] Rename audited actions and Macros Signed-off-by: Tom Eastep --- .../Macros/{macro.AAllowICMPs => macro.A_AllowICMPs} | 0 .../Macros/{macro.ADropDNSrep => macro.A_DropDNSrep} | 0 Shorewall/Macros/{macro.ADropUPnP => macro.A_DropUPnP} | 0 Shorewall/{action.ADrop => action.A_Drop} | 10 +++++----- Shorewall/{action.AReject => action.A_Reject} | 10 +++++----- Shorewall/actions.std | 4 ++-- Shorewall/shorewall.spec | 4 ++-- Shorewall6/{action.AAllowICMPs => action.A_AllowICMPs} | 2 +- Shorewall6/{action.ADrop => action.A_Drop} | 4 ++-- Shorewall6/{action.AReject => action.A_Reject} | 6 +++--- Shorewall6/actions.std | 6 +++--- Shorewall6/shorewall6.spec | 6 +++--- 12 files changed, 26 insertions(+), 26 deletions(-) rename Shorewall/Macros/{macro.AAllowICMPs => macro.A_AllowICMPs} (100%) rename Shorewall/Macros/{macro.ADropDNSrep => macro.A_DropDNSrep} (100%) rename Shorewall/Macros/{macro.ADropUPnP => macro.A_DropUPnP} (100%) rename Shorewall/{action.ADrop => action.A_Drop} (91%) rename Shorewall/{action.AReject => action.A_Reject} (89%) rename Shorewall6/{action.AAllowICMPs => action.A_AllowICMPs} (97%) rename Shorewall6/{action.ADrop => action.A_Drop} (97%) rename Shorewall6/{action.AReject => action.A_Reject} (93%) diff --git a/Shorewall/Macros/macro.AAllowICMPs b/Shorewall/Macros/macro.A_AllowICMPs similarity index 100% rename from Shorewall/Macros/macro.AAllowICMPs rename to Shorewall/Macros/macro.A_AllowICMPs diff --git a/Shorewall/Macros/macro.ADropDNSrep b/Shorewall/Macros/macro.A_DropDNSrep similarity index 100% rename from Shorewall/Macros/macro.ADropDNSrep rename to Shorewall/Macros/macro.A_DropDNSrep diff --git a/Shorewall/Macros/macro.ADropUPnP b/Shorewall/Macros/macro.A_DropUPnP similarity index 100% rename from Shorewall/Macros/macro.ADropUPnP rename to Shorewall/Macros/macro.A_DropUPnP diff --git a/Shorewall/action.ADrop b/Shorewall/action.A_Drop similarity index 91% rename from Shorewall/action.ADrop rename to Shorewall/action.A_Drop index 27a6bdf1b..bd60bb0aa 100644 --- a/Shorewall/action.ADrop +++ b/Shorewall/action.A_Drop @@ -1,9 +1,9 @@ # # Shorewall version 4 - Drop Action # -# /usr/share/shorewall/action.Drop +# /usr/share/shorewall/action.A_Drop # -# The default DROP common rules +# The audited default DROP common rules # # This action is invoked before a DROP policy is enforced. The purpose # of the action is: @@ -34,7 +34,7 @@ dropBcast(audit) # # ACCEPT critical ICMP types # -AAllowICMPs - - icmp +A_AllowICMPs - - icmp # # Drop packets that are in the INVALID state -- these are usually ICMP packets # and just confuse people when they appear in the log. @@ -44,7 +44,7 @@ dropInvalid(audit) # Drop Microsoft noise so that it doesn't clutter up the log. # SMB(A_DROP) -ADropUPnP +A_DropUPnP # # Drop 'newnotsyn' traffic so that it doesn't get logged. # @@ -53,4 +53,4 @@ dropNotSyn(audit) - - tcp # Drop late-arriving DNS replies. These are just a nuisance and clutter up # the log. # -ADropDNSrep +A_DropDNSrep diff --git a/Shorewall/action.AReject b/Shorewall/action.A_Reject similarity index 89% rename from Shorewall/action.AReject rename to Shorewall/action.A_Reject index 5ceefbfcd..845c9ed05 100644 --- a/Shorewall/action.AReject +++ b/Shorewall/action.A_Reject @@ -1,9 +1,9 @@ # # Shorewall version 4 - Reject Action # -# /usr/share/shorewall/action.Reject +# /usr/share/shorewall/action.A_Reject # -# The default REJECT action common rules +# The audited default REJECT action common rules # # This action is invoked before a REJECT policy is enforced. The purpose # of the action is: @@ -31,7 +31,7 @@ dropBcast(audit) # # ACCEPT critical ICMP types # -AAllowICMPs - - icmp +A_AllowICMPs - - icmp # # Drop packets that are in the INVALID state -- these are usually ICMP packets # and just confuse people when they appear in the log (these ICMPs cannot be @@ -42,7 +42,7 @@ dropInvalid(audit) # Reject Microsoft noise so that it doesn't clutter up the log. # SMB(A_REJECT) -ADropUPnP +A_DropUPnP # # Drop 'newnotsyn' traffic so that it doesn't get logged. # @@ -51,4 +51,4 @@ dropNotSyn(audit) - - tcp # Drop late-arriving DNS replies. These are just a nuisance and clutter up # the log. # -ADropDNSrep +A_DropDNSrep diff --git a/Shorewall/actions.std b/Shorewall/actions.std index 2e9966f02..029d44c18 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -33,7 +33,7 @@ # ############################################################################### #ACTION -ADrop # Audited Default Action for DROP policy -AReject # Audited Default action for REJECT policy +A_Drop # Audited Default Action for DROP policy +A_Reject # Audited Default action for REJECT policy Drop # Default Action for DROP policy Reject # Default Action for REJECT policy diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index c170a65c3..96a0a7f9f 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -84,9 +84,9 @@ fi %attr(0644,root,root) /usr/share/shorewall/version %attr(0644,root,root) /usr/share/shorewall/actions.std %attr(0644,root,root) /usr/share/shorewall/action.Drop -%attr(0644,root,root) /usr/share/shorewall/action.ADrop +%attr(0644,root,root) /usr/share/shorewall/action.A_Drop %attr(0644,root,root) /usr/share/shorewall/action.Reject -%attr(0644,root,root) /usr/share/shorewall/action.AReject +%attr(0644,root,root) /usr/share/shorewall/action.A_Reject %attr(0644,root,root) /usr/share/shorewall/action.template %attr(- ,root,root) /usr/share/shorewall/functions %attr(0644,root,root) /usr/share/shorewall/lib.base diff --git a/Shorewall6/action.AAllowICMPs b/Shorewall6/action.A_AllowICMPs similarity index 97% rename from Shorewall6/action.AAllowICMPs rename to Shorewall6/action.A_AllowICMPs index de39e787f..65399182a 100644 --- a/Shorewall6/action.AAllowICMPs +++ b/Shorewall6/action.A_AllowICMPs @@ -1,7 +1,7 @@ # # Shorewall6 version 4 - Audited AllowICMPs Action # -# /usr/share/shorewall6/action.AAllowICMPs +# /usr/share/shorewall6/action.A_AllowICMPs # # This action A_ACCEPTs needed ICMP types # diff --git a/Shorewall6/action.ADrop b/Shorewall6/action.A_Drop similarity index 97% rename from Shorewall6/action.ADrop rename to Shorewall6/action.A_Drop index 368b34075..09c1d1ec2 100644 --- a/Shorewall6/action.ADrop +++ b/Shorewall6/action.A_Drop @@ -26,7 +26,7 @@ Auth(A_REJECT) # # ACCEPT critical ICMP types # -AAllowICMPs - - ipv6-icmp +A_AllowICMPs - - ipv6-icmp # # Drop Broadcasts so they don't clutter up the log # (broadcasts must *not* be rejected). @@ -49,4 +49,4 @@ dropNotSyn(audit) - - tcp # Drop late-arriving DNS replies. These are just a nuisance and clutter up # the log. # -ADropDNSrep +A_DropDNSrep diff --git a/Shorewall6/action.AReject b/Shorewall6/action.A_Reject similarity index 93% rename from Shorewall6/action.AReject rename to Shorewall6/action.A_Reject index 606a360f3..ad70cd307 100644 --- a/Shorewall6/action.AReject +++ b/Shorewall6/action.A_Reject @@ -1,7 +1,7 @@ # # Shorewall6 version 4 - Audited Reject Action # -# /usr/share/shorewall6/action.AReject +# /usr/share/shorewall6/action.A_Reject # # The audited default REJECT action common rules # @@ -23,7 +23,7 @@ Auth(A_REJECT) # Drop Multicasts so they don't clutter up the log # (broadcasts must *not* be rejected). # -AAllowICMPs - - ipv6-icmp +A_AllowICMPs - - ipv6-icmp # # Drop Broadcasts so they don't clutter up the log # (broadcasts must *not* be rejected). @@ -47,4 +47,4 @@ dropNotSyn(audit) - - tcp # Drop late-arriving DNS replies. These are just a nuisance and clutter up # the log. # -ADropDNSrep +A_DropDNSrep diff --git a/Shorewall6/actions.std b/Shorewall6/actions.std index 68d623a24..6859363d8 100644 --- a/Shorewall6/actions.std +++ b/Shorewall6/actions.std @@ -19,9 +19,9 @@ # ############################################################################### #ACTION -ADrop # Audited Default Action for DROP policy -AReject # Audited Default Action for REJECT policy -AAllowICMPs # Audited Accept needed ICMP6 types +A_Drop # Audited Default Action for DROP policy +A_Reject # Audited Default Action for REJECT policy +A_AllowICMPs # Audited Accept needed ICMP6 types AllowICMPs # Accept needed ICMP6 types Drop # Default Action for DROP policy Reject # Default Action for REJECT policy diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index a4fb47965..d9b07d3b8 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -77,11 +77,11 @@ fi %attr(0644,root,root) /usr/share/shorewall6/version %attr(0644,root,root) /usr/share/shorewall6/actions.std %attr(0644,root,root) /usr/share/shorewall6/action.AllowICMPs -%attr(0644,root,root) /usr/share/shorewall6/action.AAllowICMPs +%attr(0644,root,root) /usr/share/shorewall6/action.A_AllowICMPs %attr(0644,root,root) /usr/share/shorewall6/action.Drop -%attr(0644,root,root) /usr/share/shorewall6/action.ADrop +%attr(0644,root,root) /usr/share/shorewall6/action.A_Drop %attr(0644,root,root) /usr/share/shorewall6/action.Reject -%attr(0644,root,root) /usr/share/shorewall6/action.AReject +%attr(0644,root,root) /usr/share/shorewall6/action.A_Reject %attr(0644,root,root) /usr/share/shorewall6/action.template %attr(- ,root,root) /usr/share/shorewall6/functions %attr(0644,root,root) /usr/share/shorewall6/lib.base