summaryrefslogtreecommitdiffstats
path: root/sftp.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-09-16 05:13:34 +0200
committerDamien Miller <djm@mindrot.org>2022-09-16 05:35:21 +0200
commit590db83384f9d99fc51c84505792d26d1ef60df9 (patch)
tree7f0a4b8383958d5739fc19713d074c24782437e4 /sftp.c
parentupstream: sk_enroll: never drop SSH_SK_USER_VERIFICATION_REQD flag (diff)
downloadopenssh-590db83384f9d99fc51c84505792d26d1ef60df9.tar.xz
openssh-590db83384f9d99fc51c84505792d26d1ef60df9.zip
upstream: sftp: Don't attempt to complete arguments for
non-existent commands If user entered a non-existent command (e.g. because they made a typo) there is no point in trying to complete its arguments. Skip calling complete_match() if that's the case. From Michal Privoznik OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
Diffstat (limited to 'sftp.c')
-rw-r--r--sftp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp.c b/sftp.c
index 939b8dc00..11ebe209c 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.218 2022/06/28 06:09:14 jmc Exp $ */
+/* $OpenBSD: sftp.c,v 1.219 2022/09/16 03:13:34 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -2143,7 +2143,7 @@ complete(EditLine *el, int ch)
if (carg > 1 && line[cursor-1] != ' ')
filematch = argv[carg - 1];
- if (remote != 0 &&
+ if ((remote == REMOTE || remote == LOCAL) &&
complete_match(el, complete_ctx->conn,
*complete_ctx->remote_pathp, filematch,
remote, carg == argc, quote, terminated) != 0)