summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-07-14 23:57:01 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:08:10 +1000
commitaaa8b609a7b332be836cd9a3b782422254972777 (patch)
treecb4167b3f06a11410d6b82976ddb375ed626abdc /ssh.1
parent6368022cd4dd508671c4999a59ec5826df098530 (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.123
1 files changed, 21 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index dce5f404b..7b9d3422b 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.
1409may be necessary to redirect the input from 1409may be necessary to redirect the input from
1410.Pa /dev/null 1410.Pa /dev/null
1411to make this work.) 1411to make this work.)
1412.It Ev SSH_ASKPASS_REQUIRE
1413allows further control over the use of an askpass program.
1414If this variable is set to
1415.Dq never
1416then
1417.Nm
1418will never attempt to use one.
1419If it is set to
1420.Dq prefer ,
1421then
1422.Nm
1423will prefer to use the askpass program instead of the TTY when requesting
1424passwords.
1425Finally, if the variable is set to
1426.Dq force ,
1427then the askpass program will be used for all passphrase input regardless
1428of whether
1429.Ev DISPLAY
1430is set.
1412.It Ev SSH_AUTH_SOCK 1431.It Ev SSH_AUTH_SOCK
1413Identifies the path of a 1432Identifies the path of a
1414.Ux Ns -domain 1433.Ux Ns -domain