Correct 2.0.10

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1724 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Lrp2/sbin/shorewall

@@ -599,6 +599,10 @@ show_reset() {
 	echo
 }
 
+show_proc() {
+    [ -f $1 ] && echo "   $1 = $(cat $1)"
+}
+
 #
 # Execution begins here
 #
@@ -885,6 +889,26 @@ case "$1" in
 	echo "IP Configuration"
 	echo
 	ip addr ls
+	
+	if qt which brctl; then
+	    echo
+	    echo "Bridges"
+	    echo
+	    brctl show
+	fi
+
+	echo
+	echo "/proc"
+	echo
+
+	show_proc /proc/sys/net/ipv4/ip_forward
+
+	for directory in /proc/sys/net/ipv4/conf/*; do
+	    for file in proxy_arp arp_filter rp_filter; do
+		show_proc $directory/$file
+	    done
+	done
+
 	echo
 	echo "Routing Rules"
 	echo
@@ -1037,7 +1061,7 @@ case "$1" in
 	    else
 		case $RESTOREFILE in
 		    save|restore-base)
-			echo "   ERROR: Reserved file name: save"
+			echo "   ERROR: Reserved file name: $RESTOREFILE"
 			;;
 		    *)
 			if iptables -L dynamic -n > /var/lib/shorewall/save; then
@@ -1088,7 +1112,7 @@ case "$1" in
 	    rm -f $RESTOREPATH
 	    echo "    $RESTOREPATH removed"
 	elif [ -f $RESTOREPATH ]; then
-	    echo "   ERROR: $RESTOREPATH is not a restore script"
+	    echo "   ERROR: $RESTOREPATH exists and is not a saved Shorewall configuration"
 	fi
 	;;
     ipcalc)