Merge lp:~chipaca/ubuntu-core-security/usaaage into lp:~ubuntu-security/ubuntu-core-security/trunk

[John Lenton]

In sc-logresolve: show usage if -h or --help is given; drop spurious cat; use -- to avoid grep treating logfile as an option.

I came to add a call to usage() in sc-logresolve, that had usage but was never called.

I then saw a spurious cat, so I removed it.

Then I noticed we weren't protecting $logfile from being treated as an option, so I added that.

This last item makes sc-logresolve no longer work with BSD grep.

[Jamie Strandboge (jdstrand)]

LGTM. Thanks!

review: Approve

=== modified file 'bin/sc-logresolve'
--- bin/sc-logresolve	2015-03-31 21:20:15 +0000
+++ bin/sc-logresolve	2015-06-16 17:20:35 +0000
@@ -19,6 +19,11 @@
 }
 
 if [ -n "$1" ]; then
+    if [ "$1" = "-h" -o "$1" = "--help" ]; then
+        usage
+        exit 0
+    fi
+
     logfile="$1"
     shift
 fi
@@ -27,7 +32,7 @@
     logfile="/dev/stdin"
 fi
 
-cat "$logfile" | grep 'audit: type=1326' | while read line ; do
+grep 'audit: type=1326' -- "$logfile" | while read line ; do
     call=`echo "$line" | sed 's/.* \(syscall=[0-9]\+\) .*/\1/g' | cut -d '=' -f 2`
     name=`scmp_sys_resolver $call`
     echo "$line" | sed "s/ syscall=$call / syscall=$call($name) /"