3 files changed, 24 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 549db120b..74390565e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
  - (djm) [sshd.c] Use kill(0, ...) instead of killpg(0, ...); the
    latter being specified to have undefined behaviour in SUSv3;
    ok dtucker
+ - (tim) [regress/agent.sh regress/agent-ptrace.sh] Assign $? to a variable
+   when used as an error message inside an if statement so we display the
+   correct into. agent.sh patch from Petr Lautrbach.
 
 20140127
  - (dtucker) [Makefile.in] Remove trailing backslash which some make
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index 6824b8141..ae150641f 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -45,8 +45,9 @@ else
         gdb ${SSHAGENT} ${SSH_AGENT_PID} > ${OBJ}/gdb.out 2>&1 << EOF
                 quit
 EOF
-        if [ $? -ne 0 ]; then
-                fail "gdb failed: exit code $?"
+        r=$?
+        if [ $r -ne 0 ]; then
+                fail "gdb failed: exit code $r"
         fi
         egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace.*Permission denied.|procfs:.*: Invalid argument.|Unable to access task ' >/dev/null ${OBJ}/gdb.out
         r=$?
diff --git a/regress/agent.sh b/regress/agent.sh
index 90bad15d4..cf1a45fe0 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -34,40 +34,46 @@ else
                 fi
         done
         ${SSHADD} -l > /dev/null 2>&1
-        if [ $? -ne 0 ]; then
-                fail "ssh-add -l failed: exit code $?"
+        r=$?
+        if [ $r -ne 0 ]; then
+                fail "ssh-add -l failed: exit code $r"
         fi
         # the same for full pubkey output
         ${SSHADD} -L > /dev/null 2>&1
-        if [ $? -ne 0 ]; then
-                fail "ssh-add -L failed: exit code $?"
+        r=$?
+        if [ $r -ne 0 ]; then
+                fail "ssh-add -L failed: exit code $r"
         fi
 
         trace "simple connect via agent"
         for p in 1 2; do
                 ${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p
-                if [ $? -ne 5$p ]; then
-                        fail "ssh connect with protocol $p failed (exit code $?)"
+                r=$?
+                if [ $r -ne 5$p ]; then
+                        fail "ssh connect with protocol $p failed (exit code $r)"
                 fi
         done
 
         trace "agent forwarding"
         for p in 1 2; do
                 ${SSH} -A -$p -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1
-                if [ $? -ne 0 ]; then
-                        fail "ssh-add -l via agent fwd proto $p failed (exit code $?)"
+                r=$?
+                if [ $r -ne 0 ]; then
+                        fail "ssh-add -l via agent fwd proto $p failed (exit code $r)"
                 fi
                 ${SSH} -A -$p -F $OBJ/ssh_proxy somehost \
                         "${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p"
-                if [ $? -ne 5$p ]; then
-                        fail "agent fwd proto $p failed (exit code $?)"
+                r=$?
+                if [ $r -ne 5$p ]; then
+                        fail "agent fwd proto $p failed (exit code $r)"
                 fi
         done
 
         trace "delete all agent keys"
         ${SSHADD} -D > /dev/null 2>&1
-        if [ $? -ne 0 ]; then
-                fail "ssh-add -D failed: exit code $?"
+        r=$?
+        if [ $r -ne 0 ]; then
+                fail "ssh-add -D failed: exit code $r"
         fi
 
         trace "kill agent"