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.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.1')
-rw-r--r-- | ssh.1 | 23 |
1 files changed, 21 insertions, 2 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.412 2020/04/17 03:34:42 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.413 2020/07/14 23:57:01 djm Exp $ |
37 | .Dd $Mdocdate: April 17 2020 $ | 37 | .Dd $Mdocdate: July 14 2020 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1409,6 +1409,25 @@ or related script. | |||
1409 | may be necessary to redirect the input from | 1409 | may be necessary to redirect the input from |
1410 | .Pa /dev/null | 1410 | .Pa /dev/null |
1411 | to make this work.) | 1411 | to make this work.) |
1412 | .It Ev SSH_ASKPASS_REQUIRE | ||
1413 | allows further control over the use of an askpass program. | ||
1414 | If this variable is set to | ||
1415 | .Dq never | ||
1416 | then | ||
1417 | .Nm | ||
1418 | will never attempt to use one. | ||
1419 | If it is set to | ||
1420 | .Dq prefer , | ||
1421 | then | ||
1422 | .Nm | ||
1423 | will prefer to use the askpass program instead of the TTY when requesting | ||
1424 | passwords. | ||
1425 | Finally, if the variable is set to | ||
1426 | .Dq force , | ||
1427 | then the askpass program will be used for all passphrase input regardless | ||
1428 | of whether | ||
1429 | .Ev DISPLAY | ||
1430 | is set. | ||
1412 | .It Ev SSH_AUTH_SOCK | 1431 | .It Ev SSH_AUTH_SOCK |
1413 | Identifies the path of a | 1432 | Identifies the path of a |
1414 | .Ux Ns -domain | 1433 | .Ux Ns -domain |