]> 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:

better detection of rc setting 0.4.2
authormartin f. krafft <madduck@madduck.net>
Sat, 31 May 2008 15:19:56 +0000 (17:19 +0200)
committermartin f. krafft <madduck@madduck.net>
Sat, 31 May 2008 15:19:56 +0000 (17:19 +0200)
run.d/30-query-hostname

index fc8f107a57a594032aae9eeaacfb019a95a524a6..634a4c91363987d797ab6551c96037320e4cd304 100755 (executable)
@@ -22,23 +22,26 @@ done
 test -t 0 || exit 0
 
 # we've been asked to always protect this host
 test -t 0 || exit 0
 
 # we've been asked to always protect this host
-if [ ${ALWAYS_QUERY_HOSTNAME:-0} -eq 1 ]; then
-  echo "I: $ME: $MOLLYGUARD_CMD is always molly-guarded on this system." >&2
-else
-  # only run if we are being called over SSH, that is if the current terminal
-  # was created by sshd.
-  PTS=$(readlink /proc/$$/fd/0)
-  if ! pgrep -f "^sshd.+${PTS#/dev/}[[:space:]]*$" >/dev/null \
-    && [ -z "${SSH_CONNECTION:-}" ]; then
-      if [ $PRETEND_SSH -eq 1 ]; then
-        echo "I: $ME: this is not an SSH session, but --pretend-ssh was given..." >&2
-      else
-        exit 0
-      fi
-  else
-    echo "W: $ME: SSH session detected!" >&2
-  fi
-fi
+case "${ALWAYS_QUERY_HOSTNAME:-0}" in
+  0|false|False|no|No|off|Off)
+    # only run if we are being called over SSH, that is if the current terminal
+    # was created by sshd.
+    PTS=$(readlink /proc/$$/fd/0)
+    if ! pgrep -f "^sshd.+${PTS#/dev/}[[:space:]]*$" >/dev/null \
+      && [ -z "${SSH_CONNECTION:-}" ]; then
+        if [ $PRETEND_SSH -eq 1 ]; then
+          echo "I: $ME: this is not an SSH session, but --pretend-ssh was given..." >&2
+        else
+          exit 0
+        fi
+    else
+      echo "W: $ME: SSH session detected!" >&2
+    fi
+    ;;
+  *)
+    echo "I: $ME: $MOLLYGUARD_CMD is always molly-guarded on this system." >&2
+    ;;
+esac
 
 HOSTNAME="$(hostname --short)"
 
 
 HOSTNAME="$(hostname --short)"