fix sshd detection for ControlMaster connections

[code/molly-guard.git] / run.d / 30-query-hostname

diff --git a/run.d/30-query-hostname b/run.d/30-query-hostname
index fc8f107a57a594032aae9eeaacfb019a95a524a6..d04060334e42ea3084adf1781d94ecbab8da3f15 100755 (executable)
--- a/run.d/30-query-hostname
+++ b/run.d/30-query-hostname
@@ -22,23 +22,26 @@ done
 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/}\>" >/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)"