From 8e2a2bd64897b3991dd0e657da3dd3a1626df9e7 Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sat, 18 Sep 2021 02:03:25 +0000
Subject: [PATCH] better error message for ~user failures when the sftp-server
 lacks the expand-path extension; ok deraadt@

---
 usr.bin/ssh/scp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index f3a3e1222b1..4bbd7938f71 100644
--- 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;
 }
 
-- 
2.20.1