summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 15:08:40 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 15:08:40 +1000
commit167685756fde8bc213a8df2c8e1848e312db0f46 (patch)
tree68281de2cb4e414292f5aaa1515053cdbcef4db8
parentd0b69fe90466920d69c96069312e24b581771bd7 (diff)
- logan@cvs.openbsd.org 2014/05/04 10:40:59
[connect-privsep.sh] Remove the Z flag from the list of malloc options as it was removed from malloc.c 10 days ago. OK from miod@
-rw-r--r--ChangeLog6
-rw-r--r--regress/connect-privsep.sh4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 355343398..da8db6b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,12 @@
105 - dtucker@cvs.openbsd.org 2014/05/03 18:46:14 105 - dtucker@cvs.openbsd.org 2014/05/03 18:46:14
106 [proxy-connect.sh] 106 [proxy-connect.sh]
107 Add tests for with and without compression, with and without privsep. 107 Add tests for with and without compression, with and without privsep.
108 - logan@cvs.openbsd.org 2014/05/04 10:40:59
109 [connect-privsep.sh]
110 Remove the Z flag from the list of malloc options as it
111 was removed from malloc.c 10 days ago.
112
113 OK from miod@
108 114
10920140430 11520140430
110 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already 116 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 94cc64acf..41cb7af69 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: connect-privsep.sh,v 1.4 2012/07/02 14:37:06 dtucker Exp $ 1# $OpenBSD: connect-privsep.sh,v 1.5 2014/05/04 10:40:59 logan 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"
@@ -26,7 +26,7 @@ done
26 26
27# Because sandbox is sensitive to changes in libc, especially malloc, retest 27# Because sandbox is sensitive to changes in libc, especially malloc, retest
28# with every malloc.conf option (and none). 28# with every malloc.conf option (and none).
29for m in '' A F G H J P R S X Z '<' '>'; do 29for m in '' A F G H J P R S X '<' '>'; do
30 for p in 1 2; do 30 for p in 1 2; do
31 env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true 31 env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
32 if [ $? -ne 0 ]; then 32 if [ $? -ne 0 ]; then