From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 7 Apr 2021 00:23:51 +0000 (+1000)
Subject: Remove only use of warn().
X-Git-Tag: V_8_6_P1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1bd184046bc310c405f45da3614a1dc5b3e521a;p=thirdparty%2Fopenssh-portable.git

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.
---

diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 76137b060..8970340a2 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 e9018b5e5..bc59ebddf 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: $@"