From d111e4f18690d28bb8c757773b23ae82ad3d9912 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 22 Jan 2017 15:40:36 -0800 Subject: [PATCH] Handle built-in actions in 'show action' - Remove a couple of non-actions from IPv4 actions.std Signed-off-by: Tom Eastep --- Shorewall-core/lib.cli | 11 ++++++++++- Shorewall/actions.std | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 39aec2199..ee919a188 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -1450,7 +1450,16 @@ show_command() { return fi done - echo " WARNING: Action $2 not found" >&2 + + case $2 in + allowBcast|dropBcast|dropNotSyn|rejNotSyn|allowinUPnp|forwardUPnP|Limit) + echo " WARNING: $2 is a built-in action" >&2 + ;; + *) + echo " WARNING: Action $2 not found" >&2 + ;; + esac + return ;; actions) diff --git a/Shorewall/actions.std b/Shorewall/actions.std index c92b57dbc..a75b3f277 100644 --- a/Shorewall/actions.std +++ b/Shorewall/actions.std @@ -9,8 +9,6 @@ # Builtin Actions are: # ?if 0 -A_ACCEPT # Audits then accepts a connection request -A_DROP # Audits then drops a connection request allowBcast # Silently Allow Broadcast/multicast dropBcast # Silently Drop Broadcast/multicast dropNotSyn # Silently Drop Non-syn TCP packets