From: djm@openbsd.org <djm@openbsd.org>
Date: Sat, 18 Sep 2021 02:03:25 +0000 (+0000)
Subject: upstream: better error message for ~user failures when the
X-Git-Tag: V_8_8_P1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ace19b34cc15bea3482be90450c1ed0cd0dd0669;p=thirdparty%2Fopenssh-portable.git

upstream: better error message for ~user failures when the

sftp-server lacks the expand-path extension; ok deraadt@

OpenBSD-Commit-ID: 9c1d965d389411f7e86f0a445158bf09b8f9e4bc
---

diff --git a/scp.c b/scp.c
index 4b9a87036..7c8420d27 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.236 2021/09/16 15:22:22 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.237 2021/09/18 02:03:25 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1260,7 +1260,8 @@ prepare_remote_path(struct sftp_conn *conn, const char *path)
 	if (can_expand_path(conn))
 		return do_expand_path(conn, path);
 	/* No protocol extension */
-	error("~user paths are not supported for this server");
+	error("server expand-path extension is required "
+	    "for ~user paths in SFTP mode");
 	return NULL;
 }