summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.h
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2020-07-14 23:57:01 +0000
committerdjm <djm@openbsd.org>2020-07-14 23:57:01 +0000
commit0ae95be18a2e3ed6551b51da11ea94970a77910e (patch)
tree658715e65a0d740ee031f291b72930ec367669c5 /usr.bin/ssh/ssh.h
parentProperly clean up and dereference 'old' policy after failed lookup. (diff)
downloadwireguard-openbsd-0ae95be18a2e3ed6551b51da11ea94970a77910e.tar.xz
wireguard-openbsd-0ae95be18a2e3ed6551b51da11ea94970a77910e.zip
allow some additional control over the use of ssh-askpass
via $SSH_ASKPASS_REQUIRE, including force-enable/disable. bz#69 ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.h')
-rw-r--r--usr.bin/ssh/ssh.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h
index 0d1080bbfbe..e40f04aa3a5 100644
--- a/usr.bin/ssh/ssh.h
+++ b/usr.bin/ssh/ssh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.h,v 1.89 2018/12/27 03:25:25 djm Exp $ */
+/* $OpenBSD: ssh.h,v 1.90 2020/07/14 23:57:01 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -68,6 +68,11 @@
#define SSH_ASKPASS_ENV "SSH_ASKPASS"
/*
+ * Environment variable to control whether or not askpass is used.
+ */
+#define SSH_ASKPASS_REQUIRE_ENV "SSH_ASKPASS_REQUIRE"
+
+/*
* Force host key length and server key length to differ by at least this
* many bits. This is to make double encryption with rsaref work.
*/