[openssh-commits] [openssh] 05/05: Remove only use of warn().

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit d1bd184046bc310c405f45da3614a1dc5b3e521a
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Wed Apr 7 10:23:51 2021 +1000

    Remove only use of warn().
    
    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 | 3 +--
 regress/test-exec.sh       | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 76137b06..8970340a 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -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
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e9018b5e..bc59ebdd 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -429,12 +429,6 @@ verbose ()
 	fi
 }
 
-warn ()
-{
-	echo "WARNING: $@" >>$TEST_SSH_LOGFILE
-	echo "WARNING: $@"
-}
-
 fail ()
 {
 	save_debug_log "FAIL: $@"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.