diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-07-14 23:57:01 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:08:10 +1000 |
commit | aaa8b609a7b332be836cd9a3b782422254972777 (patch) | |
tree | cb4167b3f06a11410d6b82976ddb375ed626abdc /ssh-add.1 | |
parent | 6368022cd4dd508671c4999a59ec5826df098530 (diff) |
upstream: allow some additional control over the use of ssh-askpass
via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
OpenBSD-Commit-ID: 3a1e6cbbf6241ddc4405c4246caa2c249f149eb2
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 30 |
1 files changed, 23 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.80 2020/06/26 05:04:07 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: June 26 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 |
@@ -174,7 +174,7 @@ Lock the agent with a password. | |||
174 | .El | 174 | .El |
175 | .Sh ENVIRONMENT | 175 | .Sh ENVIRONMENT |
176 | .Bl -tag -width Ds | 176 | .Bl -tag -width Ds |
177 | .It Ev "DISPLAY" and "SSH_ASKPASS" | 177 | .It Ev "DISPLAY", "SSH_ASKPASS" and "SSH_ASKPASS_REQUIRE" |
178 | If | 178 | If |
179 | .Nm | 179 | .Nm |
180 | needs a passphrase, it will read the passphrase from the current | 180 | needs a passphrase, it will read the passphrase from the current |
@@ -195,10 +195,26 @@ This is particularly useful when calling | |||
195 | from a | 195 | from a |
196 | .Pa .xsession | 196 | .Pa .xsession |
197 | or related script. | 197 | or related script. |
198 | (Note that on some machines it | 198 | .Pp |
199 | may be necessary to redirect the input from | 199 | .Ev SSH_ASKPASS_REQUIRE |
200 | .Pa /dev/null | 200 | allows further control over the use of an askpass program. |
201 | 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. | ||
202 | .It Ev SSH_AUTH_SOCK | 218 | .It Ev SSH_AUTH_SOCK |
203 | Identifies the path of a | 219 | Identifies the path of a |
204 | .Ux Ns -domain | 220 | .Ux Ns -domain |