summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-26 18:58:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-26 18:58:06 -0400
commit956627eced12ca7494d2cafc4a9d3b4ed86556f5 (patch)
tree30f806113116d5cc97a2e767c2fcebe5f4522f95 /doc/design
parent28863a41e03c762b1f3200fb34230b23f8ffc8a2 (diff)
update
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/assistant/sshpassword.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/design/assistant/sshpassword.mdwn b/doc/design/assistant/sshpassword.mdwn
index 00c33ccf8..c44259865 100644
--- a/doc/design/assistant/sshpassword.mdwn
+++ b/doc/design/assistant/sshpassword.mdwn
@@ -13,7 +13,8 @@ can be pretty sure noone is sniffing the (localhost) connection.
## ssh-askpass approach
-* If ssh-askpass is in PATH, do nothing. (Unless webapp is run remotely.)
+* If ssh-askpass is in PATH, or `SSH_ASKPASS` is set, do nothing.
+ (Unless webapp is run remotely.)
* Otherwise, have the assistant set `SSH_ASKPASS` to a command that will
cause the webapp to read the password and forward it on. Also, set
DISPLAY to ensure that ssh runs the program.