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 4b9a870361ecfad6479ca70e70c68839e439d7ce..7c8420d2746e1fd7bd94b7018e67a6de0e1ae9be 100644 (file)
--- 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;
 }