summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-09-04 19:04:16 +1000
committerDamien Miller <djm@mindrot.org>2011-09-04 19:04:16 +1000
commit6efd94f32e7ddf3cfdb94f0a3f91310304f8f6b5 (patch)
treebd39bd939fc72a9936b33b8fec4528e39e5537d1
parent58ac11a2bd0935aee87b8cc60e2b724e71c41207 (diff)
- (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
regress errors for the sandbox to warnings. ok tim dtucker
-rw-r--r--ChangeLog4
-rw-r--r--regress/connect-privsep.sh3
-rw-r--r--regress/test-exec.sh5
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bf90758c..0436c32f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120110904
2 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal
3 regress errors for the sandbox to warnings. ok tim dtucker
4
120110829 520110829
2 - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting 6 - (djm) [openbsd-compat/port-linux.c] Suppress logging when attempting
3 to switch SELinux context away from unconfined_t, based on patch from 7 to switch SELinux context away from unconfined_t, based on patch from
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index e7f938981..11fb9aef9 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -19,6 +19,7 @@ echo 'UsePrivilegeSeparation sandbox' >> $OBJ/sshd_proxy
19for p in 1 2; do 19for p in 1 2; do
20 ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true 20 ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
21 if [ $? -ne 0 ]; then 21 if [ $? -ne 0 ]; then
22 fail "ssh privsep/sandbox+proxyconnect protocol $p failed" 22 # XXX replace this with fail once sandbox has stabilised
23 warn "ssh privsep/sandbox+proxyconnect protocol $p failed"
23 fi 24 fi
24done 25done
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 5c56aefff..092cfed5b 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -204,6 +204,11 @@ verbose ()
204 fi 204 fi
205} 205}
206 206
207warn ()
208{
209 echo "WARNING: $@" >>$TEST_SSH_LOGFILE
210 echo "WARNING: $@"
211}
207 212
208fail () 213fail ()
209{ 214{