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

[code/molly-guard.git] / shutdown

diff --git a/shutdown b/shutdown
index c7402018cd0effaa1012cb431d1cfa808d82b9ec..0135f1aa435ba2fb38e77529b767983e44b0ad21 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -15,7 +15,7 @@ CMD="${0##*/}"
 EXEC="/sbin/$CMD"
 
 case "$CMD" in
 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
     if [ ! -f $EXEC ]; then
       echo "E: $ME: not a regular file: $EXEC" >&2
       exit 4


@@ -44,10 +44,14 @@ do_real_cmd()
   esac
 }
 
   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
 # 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;;
 # pass through help commands
 case "$CMD $ARGS" in
   (shutdown\ *-c*) do_real_cmd;;