merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 39 insertions, 0 deletions

diff --git a/regress/keys-command.sh b/regress/keys-command.sh
new file mode 100644
index 000000000..b595a434f
--- /dev/null
+++ b/regress/keys-command.sh
@@ -0,0 +1,39 @@
+#       $OpenBSD: keys-command.sh,v 1.2 2012/12/06 06:06:54 dtucker Exp $
+#       Placed in the Public Domain.
+
+tid="authorized keys from command"
+
+if test -z "$SUDO" ; then
+        echo "skipped (SUDO not set)"
+        echo "need SUDO to create file in /var/run, test won't work without"
+        exit 0
+fi
+
+# Establish a AuthorizedKeysCommand in /var/run where it will have
+# acceptable directory permissions.
+KEY_COMMAND="/var/run/keycommand_${LOGNAME}"
+cat << _EOF | $SUDO sh -c "cat > '$KEY_COMMAND'"
+#!/bin/sh
+test "x\$1" != "x${LOGNAME}" && exit 1
+exec cat "$OBJ/authorized_keys_${LOGNAME}"
+_EOF
+$SUDO chmod 0755 "$KEY_COMMAND"
+
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy.bak
+(
+        grep -vi AuthorizedKeysFile $OBJ/sshd_proxy.bak
+        echo AuthorizedKeysFile none
+        echo AuthorizedKeysCommand $KEY_COMMAND
+        echo AuthorizedKeysCommandUser ${LOGNAME}
+) > $OBJ/sshd_proxy
+
+if [ -x $KEY_COMMAND ]; then
+        ${SSH} -F $OBJ/ssh_proxy somehost true
+        if [ $? -ne 0 ]; then
+                fail "connect failed"
+        fi
+else
+        echo "SKIPPED: $KEY_COMMAND not executable (/var/run mounted noexec?)"
+fi
+
+$SUDO rm -f $KEY_COMMAND