Fix 'show dynamic'

Shorewall/changelog.txt

@@ -4,6 +4,8 @@ Changes in Shorewall 4.4.0-Beta3
 
 2)  Work around mis-configured interfaces.
 
+3)  Fix 'show dynamic'.
+
 Changes in Shorewall 4.4.0-Beta2
 
 1)  The 'find_first_interface_address()' and

Shorewall/lib.cli

@@ -494,10 +494,6 @@ show_command() {
 	    echo
 	    show_classifiers
 	    ;;
-	dynamic)
-	    [ $# -gt 2 ] && usage 1
-	    list_zone $2
-	    ;;
 	zones)
 	    [ $# -gt 1 ] && usage 1
 	    if [ -f ${VARDIR}/zones ]; then
@@ -618,7 +614,15 @@ show_command() {
 		esac
 	    fi
 	    
+
 	    if [ $# -gt 0 ]; then
+		if [ $1 = dynamic -a $# -gt 1 ]; then
+		    shift
+		    [ $# -eq 1 ] || usage 1
+		    list_zone $2
+		    return;
+                fi
+
 		[ -n "$table_given" ] || for chain in $*; do
 		    if ! qt $IPTABLES -t $table -L $chain $IPT_OPTIONS; then
 			echo "usage $(basename $0) show [ -x ] [ -m ] [-f] [ -t {filter|mangle|nat} ] [ {chain [<chain> [ <chain> ... ]|actions|capabilities|classifiers|config|connections|filters|ip|log|macros|mangle|nat|routing|tc|zones} ] " >&2

Shorewall/releasenotes.txt

@@ -125,6 +125,11 @@ Shorewall 4.4.0 Beta 3
     Note that a /32 should never be configured with a broadcast
     address.
 
+2)  Due to a syntax ambiguity arising from the new dynamic zone
+    implementation, 'shorewall show dynamic' produced no output. It now
+    shows the contents of the dynamic blacklist as in earlier 
+    Shorewall releases.
+
 ----------------------------------------------------------------------------
              K N O W N   P R O B L E M S   R E M A I N I N G
 ----------------------------------------------------------------------------