summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-06-30 15:06:28 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-06-30 15:06:28 +1000
commit2920bc145c9d8435e885ac6ad0a0ae613598d599 (patch)
treeb9220a2fb3a8b23e2fe98277a0ca72febf312277
parentff32d7c9d20d42db364525d92c27a7c7491caf0d (diff)
- dtucker@cvs.openbsd.org 2012/06/26 12:06:59
[regress/connect-privsep.sh] test sandbox with every malloc option
-rw-r--r--ChangeLog7
-rw-r--r--regress/connect-privsep.sh15
2 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cb04951e..f32a61902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,13 +28,16 @@
28 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests 28 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
29 to match. Feedback and ok djm@ markus@. 29 to match. Feedback and ok djm@ markus@.
30 - djm@cvs.openbsd.org 2012/06/01 00:47:35 30 - djm@cvs.openbsd.org 2012/06/01 00:47:35
31 [multiplex.sh forwarding.sh] 31 [regress/multiplex.sh regress/forwarding.sh]
32 append to rather than truncate test log; bz#2013 from openssh AT 32 append to rather than truncate test log; bz#2013 from openssh AT
33 roumenpetrov.info 33 roumenpetrov.info
34 - djm@cvs.openbsd.org 2012/06/01 00:52:52 34 - djm@cvs.openbsd.org 2012/06/01 00:52:52
35 [sftp-cmds.sh] 35 [regress/sftp-cmds.sh]
36 don't delete .* on cleanup due to unintended env expansion; pointed out in 36 don't delete .* on cleanup due to unintended env expansion; pointed out in
37 bz#2014 by openssh AT roumenpetrov.info 37 bz#2014 by openssh AT roumenpetrov.info
38 - dtucker@cvs.openbsd.org 2012/06/26 12:06:59
39 [regress/connect-privsep.sh]
40 test sandbox with every malloc option
38 41
3920120628 4220120628
40 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 43 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 11fb9aef9..f24010355 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: connect-privsep.sh,v 1.2 2011/06/30 22:44:43 markus Exp $ 1# $OpenBSD: connect-privsep.sh,v 1.3 2012/06/26 12:06:59 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="proxy connect with privsep" 4tid="proxy connect with privsep"
@@ -23,3 +23,16 @@ for p in 1 2; do
23 warn "ssh privsep/sandbox+proxyconnect protocol $p failed" 23 warn "ssh privsep/sandbox+proxyconnect protocol $p failed"
24 fi 24 fi
25done 25done
26
27# Because sandbox is sensitive to changes in libc, especially malloc, retest
28# with every malloc.conf option (and none).
29for m in '' A F G H J P R S X Z '<' '>'; do
30 for p in 1 2; do
31 env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
32 if [ $? -ne 0 ]; then
33 fail "ssh privsep/sandbox+proxyconnect protocol $p mopt '$m' failed"
34 fi
35 done
36done
37
38exit