summaryrefslogtreecommitdiff
path: root/ssh-add.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2003-09-23 18:08:35 +0000
committerColin Watson <cjwatson@debian.org>2003-09-23 18:08:35 +0000
commitd59fd3e421aa81b8e5e118f3f806081df2aca879 (patch)
tree356a4e607edc979c625bb33db63c656d771478bd /ssh-add.0
parent7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff)
parent45431c9b4677608680cd071768cbf156b316a7e8 (diff)
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'ssh-add.0')
-rw-r--r--ssh-add.036
1 files changed, 18 insertions, 18 deletions
diff --git a/ssh-add.0 b/ssh-add.0
index b0096423d..95929d4d3 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -54,6 +54,21 @@ DESCRIPTION
54 -e reader 54 -e reader
55 Remove key in smartcard reader. 55 Remove key in smartcard reader.
56 56
57ENVIRONMENT
58 DISPLAY and SSH_ASKPASS
59 If ssh-add needs a passphrase, it will read the passphrase from
60 the current terminal if it was run from a terminal. If ssh-add
61 does not have a terminal associated with it but DISPLAY and
62 SSH_ASKPASS are set, it will execute the program specified by
63 SSH_ASKPASS and open an X11 window to read the passphrase. This
64 is particularly useful when calling ssh-add from a .Xsession or
65 related script. (Note that on some machines it may be necessary
66 to redirect the input from /dev/null to make this work.)
67
68 SSH_AUTH_SOCK
69 Identifies the path of a unix-domain socket used to communicate
70 with the agent.
71
57FILES 72FILES
58 $HOME/.ssh/identity 73 $HOME/.ssh/identity
59 Contains the protocol version 1 RSA authentication identity of 74 Contains the protocol version 1 RSA authentication identity of
@@ -70,25 +85,13 @@ FILES
70 Identity files should not be readable by anyone but the user. Note that 85 Identity files should not be readable by anyone but the user. Note that
71 ssh-add ignores identity files if they are accessible by others. 86 ssh-add ignores identity files if they are accessible by others.
72 87
73ENVIRONMENT
74 DISPLAY and SSH_ASKPASS
75 If ssh-add needs a passphrase, it will read the passphrase from
76 the current terminal if it was run from a terminal. If ssh-add
77 does not have a terminal associated with it but DISPLAY and
78 SSH_ASKPASS are set, it will execute the program specified by
79 SSH_ASKPASS and open an X11 window to read the passphrase. This
80 is particularly useful when calling ssh-add from a .Xsession or
81 related script. (Note that on some machines it may be necessary
82 to redirect the input from /dev/null to make this work.)
83
84 SSH_AUTH_SOCK
85 Identifies the path of a unix-domain socket used to communicate
86 with the agent.
87
88DIAGNOSTICS 88DIAGNOSTICS
89 Exit status is 0 on success, 1 if the specified command fails, and 2 if 89 Exit status is 0 on success, 1 if the specified command fails, and 2 if
90 ssh-add is unable to contact the authentication agent. 90 ssh-add is unable to contact the authentication agent.
91 91
92SEE ALSO
93 ssh(1), ssh-agent(1), ssh-keygen(1), sshd(8)
94
92AUTHORS 95AUTHORS
93 OpenSSH is a derivative of the original and free ssh 1.2.12 release by 96 OpenSSH is a derivative of the original and free ssh 1.2.12 release by
94 Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo 97 Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
@@ -96,7 +99,4 @@ AUTHORS
96 ated OpenSSH. Markus Friedl contributed the support for SSH protocol 99 ated OpenSSH. Markus Friedl contributed the support for SSH protocol
97 versions 1.5 and 2.0. 100 versions 1.5 and 2.0.
98 101
99SEE ALSO
100 ssh(1), ssh-agent(1), ssh-keygen(1), sshd(8)
101
102BSD September 25, 1999 BSD 102BSD September 25, 1999 BSD