summaryrefslogtreecommitdiff
path: root/ssh-add.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-10-18 12:04:32 +0100
committerColin Watson <cjwatson@debian.org>2020-10-18 12:04:32 +0100
commit2b2c99658e3e8ed452e28f88f9cdbcdfb2a461cb (patch)
tree336445493163aa0370cb7830d97ebd8819b2e2c5 /ssh-add.0
parent202f5a676221c244cd450086c334c2b59f339e86 (diff)
parent279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29 (diff)
Import openssh_8.4p1.orig.tar.gz
Diffstat (limited to 'ssh-add.0')
-rw-r--r--ssh-add.020
1 files changed, 14 insertions, 6 deletions
diff --git a/ssh-add.0 b/ssh-add.0
index 698f1b891..d73af0f43 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -43,7 +43,9 @@ DESCRIPTION
43 removed. Otherwise, the argument list will be interpreted as a 43 removed. Otherwise, the argument list will be interpreted as a
44 list of paths to public key files to specify keys and 44 list of paths to public key files to specify keys and
45 certificates to be removed from the agent. If no public key is 45 certificates to be removed from the agent. If no public key is
46 found at a given path, ssh-add will append .pub and retry. 46 found at a given path, ssh-add will append .pub and retry. If
47 the argument list consists of M-bM-^@M-^\-M-bM-^@M-^] then ssh-add will read public
48 keys to be removed from standard input.
47 49
48 -E fingerprint_hash 50 -E fingerprint_hash
49 Specifies the hash algorithm used when displaying key 51 Specifies the hash algorithm used when displaying key
@@ -93,16 +95,22 @@ DESCRIPTION
93 -x Lock the agent with a password. 95 -x Lock the agent with a password.
94 96
95ENVIRONMENT 97ENVIRONMENT
96 DISPLAY and SSH_ASKPASS 98 DISPLAY, SSH_ASKPASS and SSH_ASKPASS_REQUIRE
97 If ssh-add needs a passphrase, it will read the passphrase from 99 If ssh-add needs a passphrase, it will read the passphrase from
98 the current terminal if it was run from a terminal. If ssh-add 100 the current terminal if it was run from a terminal. If ssh-add
99 does not have a terminal associated with it but DISPLAY and 101 does not have a terminal associated with it but DISPLAY and
100 SSH_ASKPASS are set, it will execute the program specified by 102 SSH_ASKPASS are set, it will execute the program specified by
101 SSH_ASKPASS (by default M-bM-^@M-^\ssh-askpassM-bM-^@M-^]) and open an X11 window to 103 SSH_ASKPASS (by default M-bM-^@M-^\ssh-askpassM-bM-^@M-^]) and open an X11 window to
102 read the passphrase. This is particularly useful when calling 104 read the passphrase. This is particularly useful when calling
103 ssh-add from a .xsession or related script. (Note that on some 105 ssh-add from a .xsession or related script.
104 machines it may be necessary to redirect the input from /dev/null 106
105 to make this work.) 107 SSH_ASKPASS_REQUIRE allows further control over the use of an
108 askpass program. If this variable is set to M-bM-^@M-^\neverM-bM-^@M-^] then ssh-add
109 will never attempt to use one. If it is set to M-bM-^@M-^\preferM-bM-^@M-^], then
110 ssh-add will prefer to use the askpass program instead of the TTY
111 when requesting passwords. Finally, if the variable is set to
112 M-bM-^@M-^\forceM-bM-^@M-^], then the askpass program will be used for all passphrase
113 input regardless of whether DISPLAY is set.
106 114
107 SSH_AUTH_SOCK 115 SSH_AUTH_SOCK
108 Identifies the path of a UNIX-domain socket used to communicate 116 Identifies the path of a UNIX-domain socket used to communicate
@@ -141,4 +149,4 @@ AUTHORS
141 created OpenSSH. Markus Friedl contributed the support for SSH protocol 149 created OpenSSH. Markus Friedl contributed the support for SSH protocol
142 versions 1.5 and 2.0. 150 versions 1.5 and 2.0.
143 151
144OpenBSD 6.7 February 7, 2020 OpenBSD 6.7 152OpenBSD 6.8 July 14, 2020 OpenBSD 6.8