summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2007-06-12 07:41:01 +0000
committerDamien Miller <djm@cvs.openbsd.org>2007-06-12 07:41:01 +0000
commit44c9889d0e126228527ab9bc0e9bb7a5e3eec464 (patch)
treeb7fd80f34054e703bfc1c0dc2614bb3428d85db3
parenta2eda39c28fae0f6d8ff485406dd0c30a02997c8 (diff)
better document ssh-add's -d option (delete identies from agent), bz#1224
new text based on some provided by andrewmc-debian AT celt.dias.ie; ok dtucker@
-rw-r--r--usr.bin/ssh/ssh-add.117
1 files changed, 14 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1
index 68b0de714e4..b5f0b5f6baa 100644
--- a/usr.bin/ssh/ssh-add.1
+++ b/usr.bin/ssh/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.44 2007/05/31 19:20:16 jmc Exp $
+.\" $OpenBSD: ssh-add.1,v 1.45 2007/06/12 07:41:00 djm Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -37,7 +37,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 12 2007 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@@ -89,7 +89,18 @@ program, rather than text entered into the requester.
.It Fl D
Deletes all identities from the agent.
.It Fl d
-Instead of adding the identity, removes the identity from the agent.
+Instead of adding identies, removes identities from the agent.
+If
+.Nm
+has been run without arguments, the keys for the default identies 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,
+.Nm
+will append
+.Pa .pub
+and retry.
.It Fl e Ar reader
Remove key in smartcard
.Ar reader .