Merge branch 'master' into 5.0.14

Fix typo in the two-interface sample snat file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
2016-11-04 08:37:55 -07:00 · 2016-11-04 08:36:24 -07:00 · 2016-11-03 21:29:01 -07:00
2 changed files with 2 additions and 2 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -949,7 +949,7 @@ show_events() {
 	for file in /proc/net/xt_recent/*; do
 	    base=$(basename $file)

-	    if [ $base != %CURRENTTIME ]; then
+	    if [ "$base" != %CURRENTTIME -a "$base" != "*" ]; then
 		echo $base
 		show_event $base
 		echo
--- a/Shorewall/Samples/two-interfaces/snat
+++ b/Shorewall/Samples/two-interfaces/snat
@@ -20,4 +20,4 @@
 MASQUERADE		10.0.0.0/8,\
 			169.254.0.0/16,\
 			172.16.0.0/12,\
-		1	92.168.0.0/16		eth0
+			92.168.0.0/16		eth0
Author	SHA1	Message	Date
Tom Eastep	6a89fd1367	Merge branch 'master' into 5.0.14	2016-11-04 08:37:55 -07:00
Tom Eastep	ffe1e1d335	Fix typo in the two-interface sample snat file. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-04 08:36:24 -07:00
Tom Eastep	cecfe54ef6	Avoid shell errors when /proc/net/xt_recent/ is empty. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2016-11-03 21:29:01 -07:00