]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Remove only use of warn().
authorDarren Tucker <dtucker@dtucker.net>
Wed, 7 Apr 2021 00:23:51 +0000 (10:23 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 7 Apr 2021 07:02:51 +0000 (17:02 +1000)
The warn() function is only used in one place in portable and does not
exist upstream.  Upgrade the only instance it's used to fail()
(the privsep/sandbox+proxyconnect, from back when that was new) and
remove the now-unused function.

regress/connect-privsep.sh
regress/test-exec.sh

index 76137b06087e94ddd221b989597bd8851d1a3b5d..8970340a29c477f261d67f88da01c918de92e4f4 100644 (file)
@@ -16,8 +16,7 @@ echo 'UsePrivilegeSeparation sandbox' >> $OBJ/sshd_proxy
 
 ${SSH} -F $OBJ/ssh_proxy 999.999.999.999 true
 if [ $? -ne 0 ]; then
-       # XXX replace this with fail once sandbox has stabilised
-       warn "ssh privsep/sandbox+proxyconnect failed"
+       fail "ssh privsep/sandbox+proxyconnect failed"
 fi
 
 # Because sandbox is sensitive to changes in libc, especially malloc, retest
index e9018b5e5f191fcbcb7fb3706d6897bc168eec60..bc59ebddf0554c1bb72417b58523cfdef3ab2c3e 100644 (file)
@@ -429,12 +429,6 @@ verbose ()
        fi
 }
 
-warn ()
-{
-       echo "WARNING: $@" >>$TEST_SSH_LOGFILE
-       echo "WARNING: $@"
-}
-
 fail ()
 {
        save_debug_log "FAIL: $@"