diff options
| author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:32:26 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:32:26 +1100 |
| commit | fae2386cc91673f4c387f58278b36ad952b7ad65 (patch) | |
| tree | c86ce892956ceab4858117d967e01dd26ec1d75c | |
| parent | 2bec5c1543aa797faa5b8abfd995a05a2f52323d (diff) | |
- stevesk@cvs.openbsd.org 2002/01/16 17:42:33
[ssh.1]
correct defaults for -i/IdentityFile; ok markus@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh.1 | 22 |
2 files changed, 19 insertions, 8 deletions
@@ -192,6 +192,9 @@ possible, but leave them commented. Uncommented options change a default value. Subsystem is currently the only default option changed. ok markus@ + - stevesk@cvs.openbsd.org 2002/01/16 17:42:33 + [ssh.1] + correct defaults for -i/IdentityFile; ok markus@ 20020121 - (djm) Rework ssh-rand-helper: @@ -7339,4 +7342,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1776 2002/01/22 12:32:07 djm Exp $ +$Id: ChangeLog,v 1.1777 2002/01/22 12:32:26 djm Exp $ @@ -34,7 +34,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. .\" -.\" $OpenBSD: ssh.1,v 1.143 2002/01/05 21:51:56 stevesk Exp $ +.\" $OpenBSD: ssh.1,v 1.144 2002/01/16 17:42:33 stevesk Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -443,11 +443,15 @@ something like .It Fl g Allows remote hosts to connect to local forwarded ports. .It Fl i Ar identity_file -Selects the file from which the identity (private key) for +Selects a file from which the identity (private key) for RSA or DSA authentication is read. -Default is +The default is .Pa $HOME/.ssh/identity -in the user's home directory. +for protocol version 1, and +.Pa $HOME/.ssh/id_rsa +and +.Pa $HOME/.ssh/id_dsa +for protocol version 2. Identity files may also be specified on a per-host basis in the configuration file. It is possible to have multiple @@ -915,10 +919,14 @@ Numeric IP addresses are also permitted (both on the command line and in .Cm HostName specifications). .It Cm IdentityFile -Specifies the file from which the user's RSA or DSA authentication identity -is read (default +Specifies a file from which the user's RSA or DSA authentication identity +is read. The default is .Pa $HOME/.ssh/identity -in the user's home directory). +for protocol version 1, and +.Pa $HOME/.ssh/id_rsa +and +.Pa $HOME/.ssh/id_dsa +for protocol version 2. Additionally, any identities represented by the authentication agent will be used for authentication. The file name may use the tilde |