1 files changed, 17 insertions, 21 deletions
diff --git a/regress/agent.sh b/regress/agent.sh
index c5e2794b7..0baf0c74a 100644
--- a/regress/agent.sh
+++ b/regress/agent.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: agent.sh,v 1.11 2015/03/03 22:35:19 markus Exp $
+#       $OpenBSD: agent.sh,v 1.12 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 tid="simple agent test"
@@ -46,28 +46,24 @@ else
        fi
        trace "simple connect via agent"
-        for p in ${SSH_PROTOCOLS}; do
+        ${SSH} -F $OBJ/ssh_proxy somehost exit 52
-                ${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p
+        r=$?
-                r=$?
+        if [ $r -ne 52 ]; then
-                if [ $r -ne 5$p ]; then
+                fail "ssh connect with failed (exit code $r)"
-                        fail "ssh connect with protocol $p failed (exit code $r)"
+        fi
-                fi
-        done
        trace "agent forwarding"
-        for p in ${SSH_PROTOCOLS}; do
+        ${SSH} -A -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1
-                ${SSH} -A -$p -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1
+        r=$?
-                r=$?
+        if [ $r -ne 0 ]; then
-                if [ $r -ne 0 ]; then
+                fail "ssh-add -l via agent fwd failed (exit code $r)"
-                        fail "ssh-add -l via agent fwd proto $p failed (exit code $r)"
+        fi
-                fi
+        ${SSH} -A -F $OBJ/ssh_proxy somehost \
-                ${SSH} -A -$p -F $OBJ/ssh_proxy somehost \
+                "${SSH} -F $OBJ/ssh_proxy somehost exit 52"
-                        "${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p"
+        r=$?
-                r=$?
+        if [ $r -ne 52 ]; then
-                if [ $r -ne 5$p ]; then
+                fail "agent fwd failed (exit code $r)"
-                        fail "agent fwd proto $p failed (exit code $r)"
+        fi
-                fi
-        done
        trace "delete all agent keys"
        ${SSHADD} -D > /dev/null 2>&1

diff --git a/regress/agent.sh b/regress/agent.sh index c5e2794b7..0baf0c74a 100644 --- a/regress/agent.sh +++ b/regress/agent.sh
@@ -1,4 +1,4 @@
1	# $OpenBSD: agent.sh,v 1.11 2015/03/03 22:35:19 markus Exp $	1	# $OpenBSD: agent.sh,v 1.12 2017/04/30 23:34:55 djm Exp $
2	# Placed in the Public Domain.	2	# Placed in the Public Domain.
3		3
4	tid="simple agent test"	4	tid="simple agent test"
@@ -46,28 +46,24 @@ else
46	fi	46	fi
47		47
48	trace "simple connect via agent"	48	trace "simple connect via agent"
49	for p in ${SSH_PROTOCOLS}; do	49	${SSH} -F $OBJ/ssh_proxy somehost exit 52
50	${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p	50	r=$?
51	r=$?	51	if [ $r -ne 52 ]; then
52	if [ $r -ne 5$p ]; then	52	fail "ssh connect with failed (exit code $r)"
53	fail "ssh connect with protocol $p failed (exit code $r)"	53	fi
54	fi
55	done
56		54
57	trace "agent forwarding"	55	trace "agent forwarding"
58	for p in ${SSH_PROTOCOLS}; do	56	${SSH} -A -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1
59	${SSH} -A -$p -F $OBJ/ssh_proxy somehost ${SSHADD} -l > /dev/null 2>&1	57	r=$?
60	r=$?	58	if [ $r -ne 0 ]; then
61	if [ $r -ne 0 ]; then	59	fail "ssh-add -l via agent fwd failed (exit code $r)"
62	fail "ssh-add -l via agent fwd proto $p failed (exit code $r)"	60	fi
63	fi	61	${SSH} -A -F $OBJ/ssh_proxy somehost \
64	${SSH} -A -$p -F $OBJ/ssh_proxy somehost \	62	"${SSH} -F $OBJ/ssh_proxy somehost exit 52"
65	"${SSH} -$p -F $OBJ/ssh_proxy somehost exit 5$p"	63	r=$?
66	r=$?	64	if [ $r -ne 52 ]; then
67	if [ $r -ne 5$p ]; then	65	fail "agent fwd failed (exit code $r)"
68	fail "agent fwd proto $p failed (exit code $r)"	66	fi
69	fi
70	done
71		67
72	trace "delete all agent keys"	68	trace "delete all agent keys"
73	${SSHADD} -D > /dev/null 2>&1	69	${SSHADD} -D > /dev/null 2>&1