Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 11 insertions, 2 deletions

diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index cd9c0023d..bd79d7cb8 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -5,7 +5,7 @@ tid="disallow agent ptrace attach"
 
 if have_prog uname ; then
         case `uname` in
-        Linux|HP-UX|SunOS|NetBSD|AIX|CYGWIN*)
+        AIX|CYGWIN*)
                 echo "skipped (not supported on this platform)"
                 exit 0
                 ;;
@@ -19,6 +19,15 @@ else
         exit 0
 fi
 
+if test -z "$SUDO" ; then
+        echo "skipped (SUDO not set)"
+        exit 0
+else
+        $SUDO chown 0 ${SSHAGENT}
+        $SUDO chgrp 0 ${SSHAGENT}
+        $SUDO chmod 2755 ${SSHAGENT}
+fi
+
 trace "start agent"
 eval `${SSHAGENT} -s` > /dev/null
 r=$?
@@ -32,7 +41,7 @@ EOF
         if [ $? -ne 0 ]; then
                 fail "gdb failed: exit code $?"
         fi
-        grep 'ptrace: Operation not permitted.' >/dev/null ${OBJ}/gdb.out
+        egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace attach: Permission denied.' >/dev/null ${OBJ}/gdb.out
         r=$?
         rm -f ${OBJ}/gdb.out
         if [ $r -ne 0 ]; then