From 89eaf99906d03b065790416668093aee3360c89f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 24 Jul 2005 16:49:02 +0000
Subject: [PATCH] Pretty up the output of 'show actions'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2403 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/actions.std | 89 +++++++++++++++++++++----------------------
 Shorewall/firewall    |  1 -
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/Shorewall/actions.std b/Shorewall/actions.std
index a84e3b664..c5b5d9480 100644
--- a/Shorewall/actions.std
+++ b/Shorewall/actions.std
@@ -21,54 +21,53 @@
 #
 #ACTION
 
-DropSMB		#Silently Drops Microsoft SMB Traffic
-RejectSMB	#Silently Reject Microsoft SMB Traffic
-DropUPnP	#Silently Drop UPnP Probes
-RejectAuth	#Silently Reject Auth
-DropPing	#Silently Drop Ping
-DropDNSrep	#Silently Drop DNS Replies
-DropEdonkey # silently drop edonkey traffic
-DropGnutella # silently drop gnutella traffic
+DropSMB		   #Silently Drops Microsoft SMB Traffic
+RejectSMB	   #Silently Reject Microsoft SMB Traffic
+DropUPnP	   #Silently Drop UPnP Probes
+RejectAuth	   #Silently Reject Auth
+DropPing	   #Silently Drop Ping
+DropDNSrep	   #Silently Drop DNS Replies
+DropEdonkey        # silently drop edonkey traffic
+DropGnutella       # silently drop gnutella traffic
 
-AllowPing	#Accept Ping
-AllowFTP	#Accept FTP
-AllowDNS	#Accept DNS
-AllowSSH	#Accept SSH
-AllowWeb	#Allow Web Browsing
-AllowSMB	#Allow MS Networking
-AllowAuth	#Allow Auth (identd)
-AllowSMTP	#Allow SMTP (Email)
-AllowPOP3	#Allow reading mail via POP3
-AllowICMPs	#Allows critical ICMP types
-AllowIMAP	#Allow reading mail via IMAP
-AllowTelnet	#Allow Telnet Access (not recommended for use over the
-		#Internet)
-AllowVNC	#Allow VNC viewer->server, Displays 0-9
-AllowVNCL	#Allow VNC server->viewer in listening mode
-AllowNTP	#Allow Network Time Protocol (ntpd)
-AllowRdate	#Allow remote time (rdate).
-AllowNNTP	#Allow network news (Usenet).
-AllowTrcrt	#Allows Traceroute (20 hops)
-AllowSNMP	#Allows SNMP (including traps)
-AllowPCA        #Allows PCAnywhere (tm)
+AllowPing	   #Accept Ping
+AllowFTP	   #Accept FTP
+AllowDNS	   #Accept DNS
+AllowSSH	   #Accept SSH
+AllowWeb	   #Allow Web Browsing
+AllowSMB	   #Allow MS Networking
+AllowAuth	   #Allow Auth (identd)
+AllowSMTP	   #Allow SMTP (Email)
+AllowPOP3	   #Allow reading mail via POP3
+AllowICMPs	   #Allows critical ICMP types
+AllowIMAP	   #Allow reading mail via IMAP
+AllowTelnet	   #Allow Telnet Access (not recommended for use over the Internet)
+AllowVNC	   #Allow VNC viewer->server, Displays 0-9
+AllowVNCL	   #Allow VNC server->viewer in listening mode
+AllowNTP	   #Allow Network Time Protocol (ntpd)
+AllowRdate	   #Allow remote time (rdate).
+AllowNNTP	   #Allow network news (Usenet).
+AllowTrcrt	   #Allows Traceroute (20 hops)
+AllowSNMP	   #Allows SNMP (including traps)
+AllowPCA           #Allows PCAnywhere (tm)
 
 # Added in Debian Packaging
-AllowSPAMD	#Allows SpamAssassin daemon
-AllowSyslog #Allows syslog udp traffic
-AllowAmanda # Allow connections required by the Amanda backup system
-AllowLDAP   # accepts LDAP traffic
-AllowICQ		# Accepts ICQ traffic
-AllowBitTorrent		# Accepts BitTorrent traffic
-AllowSMBswat		# Allows Samba Swat
-DropSMTP		# silently drops SMTP traffic
-AllowCVS		# accept cvs pserver traffic
-AllowSVN		# accept Subversion traffic
-AllowMySQL	# accept MySQL traffic
-AllowPostgreSQL	# accept PostgreSQL traffic
-AllowRsync	# accept rsync traffic
-AllowDistcc	# accept Distributed Compiler traffic
-AllowEdonkey # accept edonkey traffic
-AllowGnutella # accept edonkey traffic
+AllowSPAMD	   #Allows SpamAssassin daemon
+AllowSyslog        #Allows syslog udp traffic
+AllowAmanda        # Allow connections required by the Amanda backup system
+AllowLDAP          # accepts LDAP traffic
+AllowICQ	   # Accepts ICQ traffic
+AllowBitTorrent	   # Accepts BitTorrent traffic
+AllowSMBswat	   # Allows Samba Swat
+DropSMTP	   # silently drops SMTP traffic
+AllowCVS	   # accept cvs pserver traffic
+AllowSVN	   # accept Subversion traffic
+AllowMySQL	   # accept MySQL traffic
+AllowPostgreSQL	   # accept PostgreSQL traffic
+AllowRsync	   # accept rsync traffic
+AllowDistcc	   # accept Distributed Compiler traffic
+AllowEdonkey       # accept edonkey traffic
+AllowGnutella      # accept edonkey traffic
 
 Drop:DROP	   #Common Action for DROP policy
 Reject:REJECT      #Common Action for REJECT policy
diff --git a/Shorewall/firewall b/Shorewall/firewall
index 2d64a2beb..fd7805f76 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -7566,7 +7566,6 @@ define_firewall() # $1 = Command (Start or Restart)
     mv -f /var/lib/shorewall/restore-base-$$ /var/lib/shorewall/restore-base
     mv -f $RESTOREBASE /var/lib/shorewall/restore-tail    
 
-
 }
 
 #