* Fix the regular expression to find the sshd parent process.

[code/molly-guard.git] / shutdown

diff --git a/shutdown b/shutdown
index c9b34f2190e68d41bdea5685375506e79bc723a9..0135f1aa435ba2fb38e77529b767983e44b0ad21 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -15,7 +15,7 @@ CMD="${0##*/}"
 EXEC="/sbin/$CMD"
 
 case "$CMD" in
-  halt|reboot|shutdown)
+  halt|reboot|shutdown|poweroff)
     if [ ! -f $EXEC ]; then
       echo "E: $ME: not a regular file: $EXEC" >&2
       exit 4
@@ -36,18 +36,22 @@ do_real_cmd()
 {
   case "$ARGS" in
     (*--molly-guard-do-nothing*)
-      ARGS0="${ARGS%% --molly-guard-do-nothing*}"
+      ARGS0="${ARGS%%--molly-guard-do-nothing*}"
       ARGS1="${ARGS##*--molly-guard-do-nothing}"
-      echo "$ME: would run: $EXEC $ARGS0 ${ARGS1# }"
+      echo "$ME: would run: $EXEC ${ARGS0# } ${ARGS1# }"
       exit 0;;
     *) eval exec $EXEC "$ARGS";;
   esac
 }
 
-# require $SSH_CONNECTION to be set, indicates an SSH session
-[ -n "${SSH_CONNECTION:-}" ] || do_real_cmd
 # require an interactive terminal connected to stdin
 test -t 0                    || do_real_cmd
+
+# only run if we are being called over SSH, that is if the current terminal
+# was created by sshd.
+PTS=$(readlink /proc/$$/fd/0)
+pgrep -f "^sshd.+${PTS#/dev/}[[:space:]]*$" >/dev/null || do_real_cmd
+
 # pass through help commands
 case "$CMD $ARGS" in
   (shutdown\ *-c*) do_real_cmd;;