2 files changed, 15 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index dc9d7f63c..98b742825 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+ 20130517
+ - (dtucker) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2013/03/07 00:20:34
+     [regress/proxy-connect.sh]
+     repeat test with a style appended to the username
+
 20130516
  - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 
     executed if mktemp failed; bz#2105 ok dtucker@
diff --git a/regress/proxy-connect.sh b/regress/proxy-connect.sh
index 6a36b2513..76e602dd6 100644
--- a/regress/proxy-connect.sh
+++ b/regress/proxy-connect.sh
@@ -1,8 +1,9 @@
-#       $OpenBSD: proxy-connect.sh,v 1.5 2002/12/09 15:28:46 markus Exp $
+#       $OpenBSD: proxy-connect.sh,v 1.6 2013/03/07 00:20:34 djm Exp $
 #       Placed in the Public Domain.
 
 tid="proxy connect"
 
+verbose "plain username"
 for p in 1 2; do
         ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
         if [ $? -ne 0 ]; then
@@ -16,3 +17,10 @@ for p in 1 2; do
                 fail "bad SSH_CONNECTION"
         fi
 done
+
+verbose "username with style"
+for p in 1 2; do
+        ${SSH} -$p -F $OBJ/ssh_proxy ${USER}:style@999.999.999.999 true || \
+                fail "ssh proxyconnect protocol $p failed"
+done
+