Merge branch 'master' into 5.0.14

This commit is contained in:
Tom Eastep 2016-11-04 08:37:55 -07:00
commit 6a89fd1367
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -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