diff options
author | Damien Miller <djm@mindrot.org> | 2011-09-04 19:04:16 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-09-04 19:04:16 +1000 |
commit | 6efd94f32e7ddf3cfdb94f0a3f91310304f8f6b5 (patch) | |
tree | bd39bd939fc72a9936b33b8fec4528e39e5537d1 | |
parent | 58ac11a2bd0935aee87b8cc60e2b724e71c41207 (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-- | ChangeLog | 4 | ||||
-rw-r--r-- | regress/connect-privsep.sh | 3 | ||||
-rw-r--r-- | regress/test-exec.sh | 5 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20110904 | ||
2 | - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal | ||
3 | regress errors for the sandbox to warnings. ok tim dtucker | ||
4 | |||
1 | 20110829 | 5 | 20110829 |
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 | |||
19 | for p in 1 2; do | 19 | for 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 |
24 | done | 25 | done |
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 | ||
207 | warn () | ||
208 | { | ||
209 | echo "WARNING: $@" >>$TEST_SSH_LOGFILE | ||
210 | echo "WARNING: $@" | ||
211 | } | ||
207 | 212 | ||
208 | fail () | 213 | fail () |
209 | { | 214 | { |