merge 6.1p1

1 files changed, 12 insertions, 1 deletions

diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 11fb9aef9..94cc64acf 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: connect-privsep.sh,v 1.2 2011/06/30 22:44:43 markus Exp $
+#       $OpenBSD: connect-privsep.sh,v 1.4 2012/07/02 14:37:06 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="proxy connect with privsep"
@@ -23,3 +23,14 @@ for p in 1 2; do
                 warn "ssh privsep/sandbox+proxyconnect protocol $p failed"
         fi
 done
+
+# Because sandbox is sensitive to changes in libc, especially malloc, retest
+# with every malloc.conf option (and none).
+for m in '' A F G H J P R S X Z '<' '>'; do
+    for p in 1 2; do
+        env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
+        if [ $? -ne 0 ]; then
+                fail "ssh privsep/sandbox+proxyconnect protocol $p mopt '$m' failed"
+        fi
+    done
+done