]> git.madduck.net Git - code/molly-guard.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

* Now should also work in su/sudo sessions because it now checks whether the
authormadduck <madduck@19660600-52fe-0310-9875-adc0d7a7b53c>
Thu, 24 May 2007 12:19:43 +0000 (12:19 +0000)
committermadduck <madduck@19660600-52fe-0310-9875-adc0d7a7b53c>
Thu, 24 May 2007 12:19:43 +0000 (12:19 +0000)
  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).

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