diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /ssh-add.1 | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 47 |
1 files changed, 24 insertions, 23 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.40 2003/11/25 23:10:08 matthieu Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.42 2005/03/01 17:32:19 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -45,7 +45,7 @@ | |||
45 | .Nd adds RSA or DSA identities to the authentication agent | 45 | .Nd adds RSA or DSA identities to the authentication agent |
46 | .Sh SYNOPSIS | 46 | .Sh SYNOPSIS |
47 | .Nm ssh-add | 47 | .Nm ssh-add |
48 | .Op Fl lLdDxXc | 48 | .Op Fl cDdLlXx |
49 | .Op Fl t Ar life | 49 | .Op Fl t Ar life |
50 | .Op Ar | 50 | .Op Ar |
51 | .Nm ssh-add | 51 | .Nm ssh-add |
@@ -77,23 +77,6 @@ to work. | |||
77 | .Pp | 77 | .Pp |
78 | The options are as follows: | 78 | The options are as follows: |
79 | .Bl -tag -width Ds | 79 | .Bl -tag -width Ds |
80 | .It Fl l | ||
81 | Lists fingerprints of all identities currently represented by the agent. | ||
82 | .It Fl L | ||
83 | Lists public key parameters of all identities currently represented by the agent. | ||
84 | .It Fl d | ||
85 | Instead of adding the identity, removes the identity from the agent. | ||
86 | .It Fl D | ||
87 | Deletes all identities from the agent. | ||
88 | .It Fl x | ||
89 | Lock the agent with a password. | ||
90 | .It Fl X | ||
91 | Unlock the agent. | ||
92 | .It Fl t Ar life | ||
93 | Set a maximum lifetime when adding identities to an agent. | ||
94 | The lifetime may be specified in seconds or in a time format | ||
95 | specified in | ||
96 | .Xr sshd_config 5 . | ||
97 | .It Fl c | 80 | .It Fl c |
98 | Indicates that added identities should be subject to confirmation before | 81 | Indicates that added identities should be subject to confirmation before |
99 | being used for authentication. | 82 | being used for authentication. |
@@ -103,12 +86,30 @@ program mentioned below. | |||
103 | Successful confirmation is signaled by a zero exit status from the | 86 | Successful confirmation is signaled by a zero exit status from the |
104 | .Ev SSH_ASKPASS | 87 | .Ev SSH_ASKPASS |
105 | program, rather than text entered into the requester. | 88 | program, rather than text entered into the requester. |
106 | .It Fl s Ar reader | 89 | .It Fl D |
107 | Add key in smartcard | 90 | Deletes all identities from the agent. |
108 | .Ar reader . | 91 | .It Fl d |
92 | Instead of adding the identity, removes the identity from the agent. | ||
109 | .It Fl e Ar reader | 93 | .It Fl e Ar reader |
110 | Remove key in smartcard | 94 | Remove key in smartcard |
111 | .Ar reader . | 95 | .Ar reader . |
96 | .It Fl L | ||
97 | Lists public key parameters of all identities currently represented | ||
98 | by the agent. | ||
99 | .It Fl l | ||
100 | Lists fingerprints of all identities currently represented by the agent. | ||
101 | .It Fl s Ar reader | ||
102 | Add key in smartcard | ||
103 | .Ar reader . | ||
104 | .It Fl t Ar life | ||
105 | Set a maximum lifetime when adding identities to an agent. | ||
106 | The lifetime may be specified in seconds or in a time format | ||
107 | specified in | ||
108 | .Xr sshd_config 5 . | ||
109 | .It Fl X | ||
110 | Unlock the agent. | ||
111 | .It Fl x | ||
112 | Lock the agent with a password. | ||
112 | .El | 113 | .El |
113 | .Sh ENVIRONMENT | 114 | .Sh ENVIRONMENT |
114 | .Bl -tag -width Ds | 115 | .Bl -tag -width Ds |
@@ -129,7 +130,7 @@ and open an X11 window to read the passphrase. | |||
129 | This is particularly useful when calling | 130 | This is particularly useful when calling |
130 | .Nm | 131 | .Nm |
131 | from a | 132 | from a |
132 | .Pa .Xsession | 133 | .Pa .xsession |
133 | or related script. | 134 | or related script. |
134 | (Note that on some machines it | 135 | (Note that on some machines it |
135 | may be necessary to redirect the input from | 136 | may be necessary to redirect the input from |