diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-03-22 11:19:48 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-03-22 11:19:48 +0000 |
commit | 9b81c128761e4627fc5291f371e0d07903eb4e72 (patch) | |
tree | 7ff06aa6c4c960e7fe13b294a9c2eaddce18a2f1 /ssh-add.0 | |
parent | 925f1fb7e466dbf645650dc4ea9d2a34e728ef9c (diff) | |
download | src-9b81c128761e4627fc5291f371e0d07903eb4e72.tar.gz src-9b81c128761e4627fc5291f371e0d07903eb4e72.zip |
Vendor import of OpenSSH 6.2p1.vendor/openssh/6.2p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=248613
svn path=/vendor-crypto/openssh/6.2p1/; revision=248614; tag=vendor/openssh/6.2p1
Diffstat (limited to 'ssh-add.0')
-rw-r--r-- | ssh-add.0 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ssh-add.0 b/ssh-add.0 index 2ed59c10e6aa..ed43dc8ccaaa 100644 --- a/ssh-add.0 +++ b/ssh-add.0 @@ -37,16 +37,17 @@ DESCRIPTION -d Instead of adding identities, removes identities from the agent. If ssh-add has been run without arguments, the keys for the - default identities will be removed. Otherwise, the argument list - will be interpreted as a list of paths to public key files and - matching keys will be removed from the agent. If no public key - is found at a given path, ssh-add will append .pub and retry. + default identities and their corresponding certificates will be + removed. Otherwise, the argument list will be interpreted as a + list of paths to public key files to specify keys and + certificates to be removed from the agent. If no public key is + found at a given path, ssh-add will append .pub and retry. -e pkcs11 Remove keys provided by the PKCS#11 shared library pkcs11. - -k When loading keys into the agent, load plain private keys only - and skip certificates. + -k When loading keys into or deleting keys from the agent, process + plain private keys only and skip certificates. -L Lists public key parameters of all identities currently represented by the agent. @@ -115,4 +116,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 5.2 October 18, 2011 OpenBSD 5.2 +OpenBSD 5.3 December 3, 2012 OpenBSD 5.3 |