diff options
Diffstat (limited to 'ssh-add.0')
-rw-r--r-- | ssh-add.0 | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -29,9 +29,9 @@ DESCRIPTION | |||
29 | 29 | ||
30 | -c Indicates that added identities should be subject to confirmation | 30 | -c Indicates that added identities should be subject to confirmation |
31 | before being used for authentication. Confirmation is performed | 31 | before being used for authentication. Confirmation is performed |
32 | by the SSH_ASKPASS program mentioned below. Successful | 32 | by ssh-askpass(1). Successful confirmation is signaled by a zero |
33 | confirmation is signaled by a zero exit status from the | 33 | exit status from ssh-askpass(1), rather than text entered into |
34 | SSH_ASKPASS program, rather than text entered into the requester. | 34 | the requester. |
35 | 35 | ||
36 | -D Deletes all identities from the agent. | 36 | -D Deletes all identities from the agent. |
37 | 37 | ||
@@ -78,10 +78,11 @@ ENVIRONMENT | |||
78 | the current terminal if it was run from a terminal. If ssh-add | 78 | the current terminal if it was run from a terminal. If ssh-add |
79 | does not have a terminal associated with it but DISPLAY and | 79 | does not have a terminal associated with it but DISPLAY and |
80 | SSH_ASKPASS are set, it will execute the program specified by | 80 | SSH_ASKPASS are set, it will execute the program specified by |
81 | SSH_ASKPASS and open an X11 window to read the passphrase. This | 81 | SSH_ASKPASS (by default M-bM-^@M-^\ssh-askpassM-bM-^@M-^]) and open an X11 window to |
82 | is particularly useful when calling ssh-add from a .xsession or | 82 | read the passphrase. This is particularly useful when calling |
83 | related script. (Note that on some machines it may be necessary | 83 | ssh-add from a .xsession or related script. (Note that on some |
84 | to redirect the input from /dev/null to make this work.) | 84 | machines it may be necessary to redirect the input from /dev/null |
85 | to make this work.) | ||
85 | 86 | ||
86 | SSH_AUTH_SOCK | 87 | SSH_AUTH_SOCK |
87 | Identifies the path of a UNIX-domain socket used to communicate | 88 | Identifies the path of a UNIX-domain socket used to communicate |
@@ -116,7 +117,7 @@ EXIT STATUS | |||
116 | ssh-add is unable to contact the authentication agent. | 117 | ssh-add is unable to contact the authentication agent. |
117 | 118 | ||
118 | SEE ALSO | 119 | SEE ALSO |
119 | ssh(1), ssh-agent(1), ssh-keygen(1), sshd(8) | 120 | ssh(1), ssh-agent(1), ssh-askpass(1), ssh-keygen(1), sshd(8) |
120 | 121 | ||
121 | AUTHORS | 122 | AUTHORS |
122 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by | 123 | OpenSSH is a derivative of the original and free ssh 1.2.12 release by |
@@ -125,4 +126,4 @@ AUTHORS | |||
125 | created OpenSSH. Markus Friedl contributed the support for SSH protocol | 126 | created OpenSSH. Markus Friedl contributed the support for SSH protocol |
126 | versions 1.5 and 2.0. | 127 | versions 1.5 and 2.0. |
127 | 128 | ||
128 | OpenBSD 5.7 December 21, 2014 OpenBSD 5.7 | 129 | OpenBSD 5.7 March 30, 2015 OpenBSD 5.7 |