summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:32:26 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:32:26 +1100
commitfae2386cc91673f4c387f58278b36ad952b7ad65 (patch)
treec86ce892956ceab4858117d967e01dd26ec1d75c
parent2bec5c1543aa797faa5b8abfd995a05a2f52323d (diff)
- stevesk@cvs.openbsd.org 2002/01/16 17:42:33
[ssh.1] correct defaults for -i/IdentityFile; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.122
2 files changed, 19 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f64606c3..1dbd68c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -192,6 +192,9 @@
192 possible, but leave them commented. Uncommented options change a 192 possible, but leave them commented. Uncommented options change a
193 default value. Subsystem is currently the only default option 193 default value. Subsystem is currently the only default option
194 changed. ok markus@ 194 changed. ok markus@
195 - stevesk@cvs.openbsd.org 2002/01/16 17:42:33
196 [ssh.1]
197 correct defaults for -i/IdentityFile; ok markus@
195 198
19620020121 19920020121
197 - (djm) Rework ssh-rand-helper: 200 - (djm) Rework ssh-rand-helper:
@@ -7339,4 +7342,4 @@
7339 - Wrote replacements for strlcpy and mkdtemp 7342 - Wrote replacements for strlcpy and mkdtemp
7340 - Released 1.0pre1 7343 - Released 1.0pre1
7341 7344
7342$Id: ChangeLog,v 1.1776 2002/01/22 12:32:07 djm Exp $ 7345$Id: ChangeLog,v 1.1777 2002/01/22 12:32:26 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 54c461b26..42aa37763 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.143 2002/01/05 21:51:56 stevesk Exp $ 37.\" $OpenBSD: ssh.1,v 1.144 2002/01/16 17:42:33 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -443,11 +443,15 @@ something like
443.It Fl g 443.It Fl g
444Allows remote hosts to connect to local forwarded ports. 444Allows remote hosts to connect to local forwarded ports.
445.It Fl i Ar identity_file 445.It Fl i Ar identity_file
446Selects the file from which the identity (private key) for 446Selects a file from which the identity (private key) for
447RSA or DSA authentication is read. 447RSA or DSA authentication is read.
448Default is 448The default is
449.Pa $HOME/.ssh/identity 449.Pa $HOME/.ssh/identity
450in the user's home directory. 450for protocol version 1, and
451.Pa $HOME/.ssh/id_rsa
452and
453.Pa $HOME/.ssh/id_dsa
454for protocol version 2.
451Identity files may also be specified on 455Identity files may also be specified on
452a per-host basis in the configuration file. 456a per-host basis in the configuration file.
453It is possible to have multiple 457It is possible to have multiple
@@ -915,10 +919,14 @@ Numeric IP addresses are also permitted (both on the command line and in
915.Cm HostName 919.Cm HostName
916specifications). 920specifications).
917.It Cm IdentityFile 921.It Cm IdentityFile
918Specifies the file from which the user's RSA or DSA authentication identity 922Specifies a file from which the user's RSA or DSA authentication identity
919is read (default 923is read. The default is
920.Pa $HOME/.ssh/identity 924.Pa $HOME/.ssh/identity
921in the user's home directory). 925for protocol version 1, and
926.Pa $HOME/.ssh/id_rsa
927and
928.Pa $HOME/.ssh/id_dsa
929for protocol version 2.
922Additionally, any identities represented by the authentication agent 930Additionally, any identities represented by the authentication agent
923will be used for authentication. 931will be used for authentication.
924The file name may use the tilde 932The file name may use the tilde