From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id be7ba88a for ; Fri, 19 Apr 2019 04:11:02 +0000 (UTC) Received: (qmail 7134 invoked by alias); 19 Apr 2019 04:10:46 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44234 Received: (qmail 15627 invoked by uid 1010); 19 Apr 2019 04:10:46 -0000 X-Qmail-Scanner-Diagnostics: from mail-it1-f172.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.1/25419. spamassassin: 3.4.2. Clear:RC:0(209.85.166.172):SA:0(-1.9/5.0):. Processed in 2.028196 secs); 19 Apr 2019 04:10:46 -0000 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.166.172 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=7/7Gx7zRSV7ZBSZHXo7j0/v9VJhguRw8xBGFYUfDI7o=; b=FuZiXCRa1/3FzwFWux8jbJOi8BWVeKHkKdsmeNpXDDwlJ9zeMmgFYakoz7EIkmN2/m RMlEZHkmOgRxwBis07x4kSpRr14paTudUNcimUOgvBbVQKvKCMfZ4zuUsKzo584ajP1z WgMgcU2+hupKXKB7Z05dYVcTHpiotQ2zgENvxfxvaZjtsXoJxXWjUSejl+PaeUSJLQ3i 1TeUQ0c/LdiqrSmFtLiMbdW+8oMZzB3p0Buml/Fjw/gIUWqM+u70vcJt2USda4ZrmWxb 3n8XQKPfew/mjQkolbktlwKrXVT1cMN7XFyl/jdq1QDUQDF702mI2tV5ewdoJaFR43zC ngOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=7/7Gx7zRSV7ZBSZHXo7j0/v9VJhguRw8xBGFYUfDI7o=; b=hEIbMew9NkQ+C4vMHJxBj4OCf7TD/mlZ7s1SUA8Nl8MJeR/VqP0hfjehMW5ATbunuu 8K9Y04mFKpGJLet7GN1yw5ZZ13yL2/ayJ6+HyMTsVD9GJIqai1FrP5hImO3gdanQViZz E3W914govgxegkxuKF2RVMFDPo+ogPz2LhoJH2KBIp50DQyGkBg1jLBN/San5EOmRr/J MnI6Uw5q1azPh1ptI5CIqyhvuu0zhXqrZoJr4wUVW0XTWKX7Pva0chhHBb27WU76QzWJ XxqXf0DaJgUkRm3O9oyntVlb2T5xuZ5no9Q1lngVVeAi+1uq37IrvPfeGLq1DIrE5rUR ow3Q== X-Gm-Message-State: APjAAAWg1ysCrpOykgd1dJirc0poucg5C7d6y6hLiq9tjXCj8tem+gPR kbkUMZSgwJsw/iS4hc5KvB6PbSKu565r/w== X-Google-Smtp-Source: APXvYqxzFSouJat09bO3QeMMFvGKwdI167ZlZEYlNdGU2pQSHZ+nuFzmxJYZJxIBiG1qypXI0uPxDg== X-Received: by 2002:a24:1f50:: with SMTP id d77mr1287546itd.25.1555647010401; Thu, 18 Apr 2019 21:10:10 -0700 (PDT) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.8\)) Subject: [PATCH] Completion: OpenSSH updates Message-Id: Date: Thu, 18 Apr 2019 23:10:09 -0500 To: Zsh hackers list X-Mailer: Apple Mail (2.3445.104.8) Two parts: 1. Fix some trivial wording inconsistencies 2. Add new options for OpenSSH 8.0. `ssh-add -T` probably needs some = better exclusion stuff but i imagine this is fine for now dana diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index d1bd8f04b..e342d6666 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -8,8 +8,8 @@ _ssh () { typeset -A opt_args =20 common=3D( - '(-6)-4[forces ssh to use IPv4 addresses only]' - '(-4)-6[forces ssh to use IPv6 addresses only]' + '(-6)-4[force ssh to use IPv4 addresses only]' + '(-4)-6[force ssh to use IPv6 addresses only]' '-C[compress data]' '-c+[select encryption cipher]:encryption cipher:->ciphers' '-F+[specify alternate config file]:config file:_files' @@ -103,7 +103,7 @@ _ssh () { ;; ssh-agent) _arguments -s \ - '(-k)-a+[UNIX-domain socket to bind agent to]:UNIX-domain = socket:_files' \ + '(-k)-a+[specify UNIX-domain socket to bind agent to]:UNIX-domain = socket:_files' \ '(-k -s)-c[force csh-style shell]' \ '(-k)-d[debug mode]' \ '(-k)-D[foreground mode]' \ @@ -193,8 +193,8 @@ _ssh () { ;; ssh-keyscan) _arguments \ - '(-6)-4[forces ssh to use IPv4 addresses only]' \ - '(-4)-6[forces ssh to use IPv6 addresses only]' \ + '(-6)-4[force ssh to use IPv4 addresses only]' \ + '(-4)-6[force ssh to use IPv6 addresses only]' \ '-c[request certificates from target hosts instead of plain = keys]' \ '*-f+[read hosts from file, one per line]:file:_files' \ '-H[hash all hostnames and addresses in the output]' \ @@ -212,7 +212,7 @@ _ssh () { '-D+[connect directly to a local sftp server]:sftp server path' \ '-f[request that files be flushed immediately after transfer]' \ '-R+[specify number of outstanding requests]:number of requests = [64]' \ - '-s+[SSH2 subsystem or path to sftp server on the remote = host]:subsystem/path' \ + '-s+[specify SSH2 subsystem or path to sftp server on the remote = host]:subsystem/path' \ '1:file:->rfile' '*:file:->file' "$common[@]" = "$common_transfer[@]" && ret=3D0 ;; ssh-copy-id) diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index e342d6666..408f1d05d 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -17,6 +17,7 @@ _ssh () { '*-o+[specify extra options]:option string:->option' ) common_transfer=3D( + '-J+[connect via a jump host]: :->userhost' '-l+[limit used bandwidth]:bandwidth (Kbit/s)' '-P+[specify port on remote host]:port number on remote host' '-p[preserve modification times, access times and modes]' @@ -75,6 +76,7 @@ _ssh () { _arguments -C -s \ '-3[copy through local host, not directly between the remote = hosts]' \ '-B[batch mode (don'\''t ask for passphrases)]' \ + '-T[disable strict filename checking]' \ '*:file:->file' "$common[@]" "$common_transfer[@]" && ret=3D0 ;; ssh-add) @@ -95,6 +97,8 @@ _ssh () { '-M+[specify maximum number of signatures]:number' \ '-s+[add keys provided by the PKCS#11 shared = library]:library:_files -g "*.(so|dylib)(|.<->)(-.)"' \ '-t+[set maximum lifetime for identity]:maximum lifetime (in = seconds or time format):' \ + "-T[test usability of identity files' private keys]" \ + '-v[verbose mode]' \ '-q[be quiet after a successful operation]' \ '-X[unlock the agent]' \ '-x[lock the agent with a password]' \ @@ -112,6 +116,7 @@ _ssh () { '(-k)-P[specify PKCS#11 shared library whitelist]:PKCS#11 library = whitelist pattern' \ '(-k -c)-s[force sh-style shell]' \ '-t[set default maximum lifetime for identities]:maximum lifetime = (in seconds or time format):' \ + '-v[verbose mode]' \ '*::command: _normal' return ;;