From eae01af2fc40336d48914df98e500fdadb89186c Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 27 Nov 2005 21:11:14 +0000
Subject: [PATCH] shorewall show macros -- Take 3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3085 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/macro.SMB | 2 +-
 Shorewall/shorewall | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Shorewall/macro.SMB b/Shorewall/macro.SMB
index 67bd6d308..46162be54 100644
--- a/Shorewall/macro.SMB
+++ b/Shorewall/macro.SMB
@@ -3,7 +3,7 @@
 #
 # /usr/share/shorewall/macro.SMB
 #
-#	This macro handle Microsoft SMB traffic. You need to invoke this macro
+#	This macro handles Microsoft SMB traffic. You need to invoke this macro
 #	in both directions.
 #
 ###############################################################################
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 07f95e508..d4df01fb1 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -919,11 +919,7 @@ case "$1" in
 		if [ -n "$foo" ]; then
 		    macro=${macro#*.}
 		    foo=${foo%.*}
-		    if [ ${#macro} -lt 4 ]; then
-			echo "   $macro  ${foo#\#}"
-		    else
-			echo "   $macro ${foo#\#}"
-		    fi
+		    echo "   $macro  ${foo#\#}"
 		fi
 	    done
 	    ;;