diff options
| author |   aaron <aaron@openbsd.org> | 2000-03-23 21:10:09 +0000 |
|---|---|---|
| committer | aaron <aaron@openbsd.org> | 2000-03-23 21:10:09 +0000 |
| commit | bf9a4e5f3b5f92ebe78ee9452d81acb79f500cb2 (patch) | |
| tree | a34738fae37a92061b6d13fd2b0ccafab2f0d005 /usr.bin/ssh/ssh-add.1 | |
| parent | new cpu type switch code. (diff) | |
| download | wireguard-openbsd-bf9a4e5f3b5f92ebe78ee9452d81acb79f500cb2.tar.xz wireguard-openbsd-bf9a4e5f3b5f92ebe78ee9452d81acb79f500cb2.zip | |
Fix some formatting problems I missed before.
Diffstat (limited to 'usr.bin/ssh/ssh-add.1')
| -rw-r--r-- | usr.bin/ssh/ssh-add.1 | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1 index 8872e715432..8d1486b52db 100644 --- a/usr.bin/ssh/ssh-add.1 +++ b/usr.bin/ssh/ssh-add.1 @@ -9,7 +9,7 @@ .\" .\" Created: Sat Apr 22 23:55:14 1995 ylo .\" -.\" $Id: ssh-add.1,v 1.10 2000/01/22 02:17:50 aaron Exp $ +.\" $Id: ssh-add.1,v 1.11 2000/03/23 21:11:38 aaron Exp $ .\" .Dd September 25, 1999 .Dt SSH-ADD 1 @@ -27,11 +27,11 @@ adds identities to the authentication agent, .Xr ssh-agent 1 . When run without arguments, it adds the file .Pa $HOME/.ssh/identity . -Alternative file names can be given on the -command line. If any file requires a passphrase, +Alternative file names can be given on the command line. +If any file requires a passphrase, .Nm asks for the passphrase from the user. -The Passphrase it is read from the user's tty. +The Passphrase it is read from the user's tty. .Pp The authentication agent must be running and must be an ancestor of the current process for @@ -52,15 +52,15 @@ Deletes all identities from the agent. .Sh FILES .Bl -tag -width Ds .It Pa $HOME/.ssh/identity -Contains the RSA authentication identity of the user. This file -should not be readable by anyone but the user. +Contains the RSA authentication identity of the user. +This file should not be readable by anyone but the user. Note that .Nm ignores this file if it is accessible by others. It is possible to specify a passphrase when generating the key; that passphrase will be -used to encrypt the private part of this file. This is the -default file added by +used to encrypt the private part of this file. +This is the default file added by .Nm when no other files have been specified. .Pp @@ -70,7 +70,8 @@ when no other files have been specified. If .Nm needs a passphrase, it will read the passphrase from the current -terminal if it was run from a terminal. If +terminal if it was run from a terminal. +If .Nm does not have a terminal associated with it but .Ev DISPLAY @@ -78,12 +79,13 @@ and .Ev SSH_ASKPASS are set, it will execute the program specified by .Ev SSH_ASKPASS -and open an X11 window to read the passphrase. This is particularly -useful when calling +and open an X11 window to read the passphrase. +This is particularly useful when calling .Nm from a .Pa .Xsession -or related script. (Note that on some machines it +or related script. +(Note that on some machines it may be necessary to redirect the input from .Pa /dev/null to make this work.) @@ -92,9 +94,10 @@ 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 +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, see |