* Now should also work in su/sudo sessions because it now checks whether the

  creator of the current tty/pts is sshd, rather than the brittle check for
  the environment. Thanks to Craig Small and Don Armstrong for their sparks
  of brilliance (closes: #425831).

diff --git a/shutdown b/shutdown
index 8beaa50558358eb6e7a5e021399fde0ff8309a7c..db836efc73affcee2abc464fedf5636fa9bb6b04 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -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/}$" >/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;;