better error message for ~user failures when the sftp-server

lacks the expand-path extension; ok deraadt@

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index f3a3e12..4bbd793 100644 (file)
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/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).
@@ -1227,7 +1227,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;
 }