summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Martin <phy1729@gmail.com>2015-10-19 11:23:57 +0200
committerOliver Kiddle <opk@zsh.org>2015-10-19 11:23:57 +0200
commit509c822b626c01e0787aac2baef5af80d15da529 (patch)
treebb97e5493752c36356824d3b2c0a27a07204e274
parent2e600b432a1a0167304ba5b57738b9f5c0af1cc3 (diff)
downloadzsh-509c822b626c01e0787aac2baef5af80d15da529.tar.gz
zsh-509c822b626c01e0787aac2baef5af80d15da529.zip
36869: use permissions to limit files completed for ssh identity files
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_ssh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70a8d2e2e..ea86f62cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-19 Oliver Kiddle <opk@zsh.org>
+
+ * 36869: Matthew Martin: Completion/Unix/Command/_ssh: use
+ permissions to limit files completed for ssh identity files
+
2015-10-18 Frank Terbeck <ft@bewatermyfriend.org>
* 36888: Functions/VCS_Info/vcs_info: vcs_info: Prevent
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index a66702a65..c6ede9efe 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -18,7 +18,7 @@ _ssh () {
# for protocol version 2, this can be a comma-separated list
'-c+[select encryption cipher]:encryption cipher:(idea des 3des blowfish arcfour tss none)'
'-F+[specify alternate config file]:config file:_files'
- '*-i+[select identity file]:SSH identity file:_files'
+ '*-i+[select identity file]:SSH identity file:_files -g "*(-.^AR)"'
'*-o+[specify extra options]:option string:->option'
)
common_transfer=(