From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5184 invoked by alias); 5 Apr 2018 02:17:52 -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: 42584 Received: (qmail 6932 invoked by uid 1010); 5 Apr 2018 02:17:52 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(205.235.26.22):SA:0(-0.5/5.0):. Processed in 27.206524 secs); 05 Apr 2018 02:17:52 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, NML_ADSP_CUSTOM_MED,SPF_PASS,T_DKIM_INVALID,T_RP_MATCHES_RCVD autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: SRS0=fJi4=G2=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=fail (2048-bit key) reason="fail (body has been altered)" header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1522894256; bh=fO0oI84azNueLYrkfWOp/gK139G2S3R8TM4jViJYp6U=; h=From:To:Subject:Date:From:Subject; b=LOhk0lJ9R6dpzPYZ6qFhsO7+OpZL3kaFEXFP+w1YVeG4cW21988OMEL5qgmswMs2bzGy8lcqnlkpmxc8oA6/OipB1RybewzYPKvDXJSUrZxvp7kVtQR/WQnwh2+6UWFwqdQuKuLgaKbCaqUdqAbmwKs1pNUpZt0PSPC6i5KCwzXOUDFQovl0Y6OdmrviB+WOotP6UHI+LbcoVOwdVv+Dm2Cio4zFMR/0yWZasu6xn77cdUu0ShTxBbJ5AG4k8OLiYHTHUXGnJhKKo+7xM6g4RCdRjTLA/LW+u9sTD57MZHPl/i1KZlrneAADGvHXL+rizCwU7rZ/H126KSkU+pLsbA== X-YMail-OSG: 5tVRQi8VM1lf19dT11LMHvugvl42ska2WXmd3TTNFpCtXLIyuvrl8zbG7.i_Kpl A7S95MtOOnRmovhhVNt_sXp8mwdKBFGEkonss2s1PpBBA4rqscsK8bppsfG2GfTMxoADWhpc0ARa B_UeDDWpV3dp.HKw.Z7DDpQHJT104SHv5TwEUzw0xOYaN0GeTEmgg207dHbmAiTy6aLJp8VtCDKZ Pa5xvwi25b9EP6OEAD3ZlOBtNfiD7ebexXa9aY97GTBiNkAkAN7OSgivi_i3Bwy0tbr7.BBuHAiq sSOdi1AQvtXGXdJtnOcbEzf.q_rFgLM3CBEbNnID5GyDThrovVsehcnx9DanIlF1e24DaZ22SfbI F0gaKEG65obB.HJnsvtPWbf3.qRImDfGhq7uD4QemD9tbQi9yGVKU7MdsShBmphs13CEUKKsArIk YOPcaWWcS3jejGMCMDjnnTovsQwWWl5LY7jcIokbTMDBcoUobzx3TJtz3ovf4DpRDEGTD63nA5_b MJxO9FFYyNQ-- From: Oliver Kiddle To: Zsh workers Subject: PATCH: handle ssh-keyscan in _ssh completion function MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <24420.1522881706.1@thecus> Date: Thu, 05 Apr 2018 00:41:46 +0200 Message-ID: <24421.1522881706@thecus> This adds completion for ssh-keyscan to _ssh. The options to ssh-copy-id have also been updated. openssh 7.7 doesn't appear to add any completion relevant options by the way. Oliver diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index 20a5536ee..2aae7027e 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -1,6 +1,6 @@ -#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen sftp ssh-copy-id +#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sftp -# TODO: sshd, ssh-keyscan, ssh-keysign +# TODO: sshd, ssh-keysign _ssh () { local curcontext="$curcontext" state line expl suf ret=1 @@ -187,7 +187,20 @@ _ssh () { "($cmn -I -h -n -O -V)-k[generate a KRL file]" \ "$p1($cmn -I -h -n -O -V)-u[update a KRL]" return - ;; + ;; + ssh-keyscan) + _arguments \ + '(-6)-4[forces ssh to use IPv4 addresses only]' \ + '(-4)-6[forces 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]' \ + '-p+[specify port on remote host]:port number on remote host' \ + '-T+[specify timeout]:timeout (seconds) [5]' \ + '-t+[specify key types to fetch from scanned hosts]:key type:_sequence compadd - rsa dsa ecdsa ed25519' \ + '-v[verbose mode]' + return + ;; sftp) _arguments -C -s \ '-a[attempt to continue interrupted transfers]' \ @@ -199,10 +212,15 @@ _ssh () { '-s+[SSH2 subsystem or path to sftp server on the remote host]:subsystem/path' \ '1:file:->rfile' '*:file:->file' "$common[@]" "$common_transfer[@]" && ret=0 ;; - (ssh-copy-id) + ssh-copy-id) _arguments \ - '-i+[select identity file]:SSH identity file:_files' \ - ':remote host name:->userhost' \ + '-i+[select identity file]:SSH identity file:_files -g "*(-.^AR)"' \ + '-f[copy keys without trying to check if they are already installed]' \ + '-n[dry run - no keys are actually copied]' \ + '*-o+[specify ssh options]:option string:->option' \ + '-p+[specify port on remote host]:port number on remote host' \ + '(- 1)'{-h,-\?}'[display usage information]' \ + ':remote host name:->userhost' && ret=0 ;; esac