From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 12 May 2023 06:36:27 +0000 (+0000)
Subject: upstream: better error messages
X-Git-Tag: V_9_4_P1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e43f43d3f19516222e9a143468ea0dc1b3ab67b6;p=thirdparty%2Fopenssh-portable.git

upstream: better error messages

OpenBSD-Regress-ID: 55e4186604e80259496d841e690ea2090981bc7a
---

diff --git a/regress/forcecommand.sh b/regress/forcecommand.sh
index e059f1fdb..e756600a6 100644
--- a/regress/forcecommand.sh
+++ b/regress/forcecommand.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: forcecommand.sh,v 1.4 2017/04/30 23:34:55 djm Exp $
+#	$OpenBSD: forcecommand.sh,v 1.5 2023/05/12 06:36:27 djm Exp $
 #	Placed in the Public Domain.
 
 tid="forced command"
@@ -12,7 +12,7 @@ for t in ${SSH_KEYTYPES}; do
 done
 
 trace "forced command in key option"
-${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key"
+${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key option"
 
 cp /dev/null $OBJ/authorized_keys_$USER
 for t in ${SSH_KEYTYPES}; do
@@ -24,7 +24,7 @@ cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
 echo "ForceCommand true" >> $OBJ/sshd_proxy
 
 trace "forced command in sshd_config overrides key option"
-${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key"
+${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command config"
 
 cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy
 echo "ForceCommand false" >> $OBJ/sshd_proxy
@@ -32,4 +32,4 @@ echo "Match User $USER" >> $OBJ/sshd_proxy
 echo "    ForceCommand true" >> $OBJ/sshd_proxy
 
 trace "forced command with match"
-${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command in key"
+${SSH} -F $OBJ/ssh_proxy somehost false || fail "forced command match"