diff options
author | Damien Miller <djm@mindrot.org> | 2010-03-05 21:31:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-03-05 21:31:11 +1100 |
commit | 5059d8d7e647ed6202e3d77f623774919b20eefc (patch) | |
tree | 285bb505349fb471abe769549afd67f462ba3596 /ssh-add.1 | |
parent | 922b541329285cede860607c877f72663f3d2a9f (diff) |
- djm@cvs.openbsd.org 2010/03/05 10:28:21
[ssh-add.1 ssh.1 ssh_config.5]
mention loading of certificate files from [private]-cert.pub when
they are present; feedback and ok jmc@
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.51 2010/02/10 23:20:38 markus Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -37,7 +37,7 @@ | |||
37 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 37 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
38 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 38 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
39 | .\" | 39 | .\" |
40 | .Dd $Mdocdate: February 10 2010 $ | 40 | .Dd $Mdocdate: March 5 2010 $ |
41 | .Dt SSH-ADD 1 | 41 | .Dt SSH-ADD 1 |
42 | .Os | 42 | .Os |
43 | .Sh NAME | 43 | .Sh NAME |
@@ -61,7 +61,14 @@ When run without arguments, it adds the files | |||
61 | .Pa ~/.ssh/id_dsa | 61 | .Pa ~/.ssh/id_dsa |
62 | and | 62 | and |
63 | .Pa ~/.ssh/identity . | 63 | .Pa ~/.ssh/identity . |
64 | After loading a private key, | ||
65 | .Nm | ||
66 | will try to load corresponding certificate information from the | ||
67 | filename obtained by appending | ||
68 | .Pa -cert.pub | ||
69 | to the name of the private key file. | ||
64 | Alternative file names can be given on the command line. | 70 | Alternative file names can be given on the command line. |
71 | .Pp | ||
65 | If any file requires a passphrase, | 72 | If any file requires a passphrase, |
66 | .Nm | 73 | .Nm |
67 | asks for the passphrase from the user. | 74 | asks for the passphrase from the user. |