Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / regress / agent-getpeereid.sh

diff --git a/openssh/regress/agent-getpeereid.sh b/openssh/regress/agent-getpeereid.sh
index 46d20dc2b5879d45f111255ee399e61823651e53..5d7f73291dc801a5415708c271bf53f9fde24f6d 100644 (file)
--- a/openssh/regress/agent-getpeereid.sh
+++ b/openssh/regress/agent-getpeereid.sh
@@ -1,17 +1,24 @@
-#      $OpenBSD: agent-getpeereid.sh,v 1.1 2002/12/09 16:05:02 markus Exp $
+#      $OpenBSD: agent-getpeereid.sh,v 1.4 2007/11/25 15:35:09 jmc Exp $
 #      Placed in the Public Domain.
 
 tid="disallow agent attach from other uid"
 
 UNPRIV=nobody
 ASOCK=${OBJ}/agent
-SSH_AUTH_SOCK=/nonexistant
+SSH_AUTH_SOCK=/nonexistent
 
-if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1
+if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 && \
+       grep "#undef.*HAVE_GETPEERUCRED" ${BUILDDIR}/config.h >/dev/null && \
+       grep "#undef.*HAVE_SO_PEERCRED" ${BUILDDIR}/config.h >/dev/null
 then
        echo "skipped (not supported on this platform)"
        exit 0
 fi
+if [ -z "$SUDO" ]; then
+       echo "skipped: need SUDO to switch to uid $UNPRIV"
+       exit 0
+fi
+
 
 trace "start agent"
 eval `${SSHAGENT} -s -a ${ASOCK}` > /dev/null
@@ -27,7 +34,7 @@ else
                fail "ssh-add failed with $r != 1"
        fi
 
-       < /dev/null sudo -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1
+       < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1
        r=$?
        if [ $r -lt 2 ]; then
                fail "ssh-add did not fail for ${UNPRIV}: $r < 2"