- (djm) Convert mandoc manpages to man automatically. Patch from Mark D.

[openssh.git] / ssh-add.1

diff --git a/ssh-add.1 b/ssh-add.1
index f0c31a272e2138157cb776584f6a0be449d5bd2f..d7725c6e3652c0b0c14b73c4963f1482fe97651c 100644 (file)
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,15 +1,41 @@
-.\"  -*- nroff -*-
+.\"    $OpenBSD: ssh-add.1,v 1.24 2001/04/10 09:13:21 itojun Exp $

 .\"
 .\"

-.\" ssh-add.1
+.\"  -*- nroff -*-

 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>

-.\"

 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
 .\"                    All rights reserved
 .\"
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
 .\"                    All rights reserved
 .\"

-.\" Created: Sat Apr 22 23:55:14 1995 ylo
+.\" As far as I am concerned, the code I have written for this software
+.\" can be used freely for any purpose.  Any derived versions of this
+.\" software must be clearly marked as such, and if the derived work is
+.\" incompatible with the protocol description in the RFC file, it must be
+.\" called by a name other than "ssh" or "Secure Shell".
+.\"
+.\"
+.\" Copyright (c) 1999,2000 Markus Friedl.  All rights reserved.
+.\" Copyright (c) 1999 Aaron Campbell.  All rights reserved.
+.\" Copyright (c) 1999 Theo de Raadt.  All rights reserved.

 .\"
 .\"

-.\" $Id$
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (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 September 25, 1999
 .Dt SSH-ADD 1
 .\"
 .Dd September 25, 1999
 .Dt SSH-ADD 1


@@ -32,6 +58,8 @@ If any file requires a passphrase,
 .Nm
 asks for the passphrase from the user.
 The Passphrase it is read from the user's tty.
 .Nm
 asks for the passphrase from the user.
 The Passphrase it is read from the user's tty.

+.Nm
+retries the last passphrase if multiple identity files are given.

 .Pp
 The authentication agent must be running and must be an ancestor of
 the current process for
 .Pp
 The authentication agent must be running and must be an ancestor of
 the current process for


@@ -52,7 +80,7 @@ Deletes all identities from the agent.
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/identity
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/identity

-Contains the RSA authentication identity of the user.
+Contains the protocol version 1 RSA authentication identity of the user.

 This file should not be readable by anyone but the user.
 Note that
 .Nm
 This file should not be readable by anyone but the user.
 Note that
 .Nm


@@ -64,7 +92,9 @@ This is the default file added by
 .Nm
 when no other files have been specified.
 .It Pa $HOME/.ssh/id_dsa
 .Nm
 when no other files have been specified.
 .It Pa $HOME/.ssh/id_dsa

-Contains the DSA authentication identity of the user.
+Contains the protocol version 2 DSA authentication identity of the user.
+.It Pa $HOME/.ssh/id_rsa
+Contains the protocol version 2 RSA authentication identity of the user.

 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Ds


@@ -92,33 +122,17 @@ may be necessary to redirect the input from
 .Pa /dev/null
 to make this work.)
 .El
 .Pa /dev/null
 to make this work.)
 .El

-.Sh AUTHOR
-Tatu Ylonen <ylo@cs.hut.fi>
-.Pp
-OpenSSH
-is a derivative of the original (free) ssh 1.2.12 release, but with bugs
-removed and newer features re-added.
-Rapidly after the 1.2.12 release,
-newer versions bore successively more restrictive licenses.
-This version of OpenSSH
-.Bl -bullet
-.It
-has all components of a restrictive nature (i.e., patents)
-directly removed from the source code; any licensed or patented components
-are chosen from
-external libraries.
-.It
-has been updated to support ssh protocol 1.5.
-.It
-contains added support for
-.Xr kerberos 8
-authentication and ticket passing.
-.It
-supports one-time password authentication with
-.Xr skey 1 .
-.El
+.Sh AUTHORS
+OpenSSH is a derivative of the original and free
+ssh 1.2.12 release by Tatu Ylonen.
+Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
+Theo de Raadt and Dug Song
+removed many bugs, re-added newer features and
+created OpenSSH.
+Markus Friedl contributed the support for SSH
+protocol versions 1.5 and 2.0.

 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-agent 1 ,
 .Xr ssh-keygen 1 ,
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-agent 1 ,
 .Xr ssh-keygen 1 ,

-.Xr sshd 8 ,
+.Xr sshd 8