diff options
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 35 |
1 files changed, 28 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.79 2020/02/07 03:57:31 djm Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.81 2020/07/14 23:57:01 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | .\" Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: February 7 2020 $ | 38 | .Dd $Mdocdate: July 14 2020 $ |
39 | .Dt SSH-ADD 1 | 39 | .Dt SSH-ADD 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -113,6 +113,11 @@ If no public key is found at a given path, | |||
113 | will append | 113 | will append |
114 | .Pa .pub | 114 | .Pa .pub |
115 | and retry. | 115 | and retry. |
116 | If the argument list consists of | ||
117 | .Dq - | ||
118 | then | ||
119 | .Nm | ||
120 | will read public keys to be removed from standard input. | ||
116 | .It Fl E Ar fingerprint_hash | 121 | .It Fl E Ar fingerprint_hash |
117 | Specifies the hash algorithm used when displaying key fingerprints. | 122 | Specifies the hash algorithm used when displaying key fingerprints. |
118 | Valid options are: | 123 | Valid options are: |
@@ -169,7 +174,7 @@ Lock the agent with a password. | |||
169 | .El | 174 | .El |
170 | .Sh ENVIRONMENT | 175 | .Sh ENVIRONMENT |
171 | .Bl -tag -width Ds | 176 | .Bl -tag -width Ds |
172 | .It Ev "DISPLAY" and "SSH_ASKPASS" | 177 | .It Ev "DISPLAY", "SSH_ASKPASS" and "SSH_ASKPASS_REQUIRE" |
173 | If | 178 | If |
174 | .Nm | 179 | .Nm |
175 | needs a passphrase, it will read the passphrase from the current | 180 | needs a passphrase, it will read the passphrase from the current |
@@ -190,10 +195,26 @@ This is particularly useful when calling | |||
190 | from a | 195 | from a |
191 | .Pa .xsession | 196 | .Pa .xsession |
192 | or related script. | 197 | or related script. |
193 | (Note that on some machines it | 198 | .Pp |
194 | may be necessary to redirect the input from | 199 | .Ev SSH_ASKPASS_REQUIRE |
195 | .Pa /dev/null | 200 | allows further control over the use of an askpass program. |
196 | to make this work.) | 201 | If this variable is set to |
202 | .Dq never | ||
203 | then | ||
204 | .Nm | ||
205 | will never attempt to use one. | ||
206 | If it is set to | ||
207 | .Dq prefer , | ||
208 | then | ||
209 | .Nm | ||
210 | will prefer to use the askpass program instead of the TTY when requesting | ||
211 | passwords. | ||
212 | Finally, if the variable is set to | ||
213 | .Dq force , | ||
214 | then the askpass program will be used for all passphrase input regardless | ||
215 | of whether | ||
216 | .Ev DISPLAY | ||
217 | is set. | ||
197 | .It Ev SSH_AUTH_SOCK | 218 | .It Ev SSH_AUTH_SOCK |
198 | Identifies the path of a | 219 | Identifies the path of a |
199 | .Ux Ns -domain | 220 | .Ux Ns -domain |