[ssh.1]
     correct defaults for -i/IdentityFile; ok markus@
This commit is contained in:
Damien Miller 2002-01-22 23:32:26 +11:00
parent 2bec5c1543
commit fae2386cc9
2 changed files with 19 additions and 8 deletions

View File

@ -192,6 +192,9 @@
possible, but leave them commented. Uncommented options change a possible, but leave them commented. Uncommented options change a
default value. Subsystem is currently the only default option default value. Subsystem is currently the only default option
changed. ok markus@ changed. ok markus@
- stevesk@cvs.openbsd.org 2002/01/16 17:42:33
[ssh.1]
correct defaults for -i/IdentityFile; ok markus@
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7339,4 +7342,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

22
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -443,11 +443,15 @@ something like
.It Fl g .It Fl g
Allows remote hosts to connect to local forwarded ports. Allows remote hosts to connect to local forwarded ports.
.It Fl i Ar identity_file .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. RSA or DSA authentication is read.
Default is The default is
.Pa $HOME/.ssh/identity .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 Identity files may also be specified on
a per-host basis in the configuration file. a per-host basis in the configuration file.
It is possible to have multiple 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 .Cm HostName
specifications). specifications).
.It Cm IdentityFile .It Cm IdentityFile
Specifies the file from which the user's RSA or DSA authentication identity Specifies a file from which the user's RSA or DSA authentication identity
is read (default is read. The default is
.Pa $HOME/.ssh/identity .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 Additionally, any identities represented by the authentication agent
will be used for authentication. will be used for authentication.
The file name may use the tilde The file name may use the tilde