summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 21:31:11 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 21:31:11 +1100
commit5059d8d7e647ed6202e3d77f623774919b20eefc (patch)
tree285bb505349fb471abe769549afd67f462ba3596 /ssh-add.1
parent922b541329285cede860607c877f72663f3d2a9f (diff)
downloadopenssh-git-5059d8d7e647ed6202e3d77f623774919b20eefc.tar.gz
- 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.111
1 files changed, 9 insertions, 2 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index 0d5e3927..d7cc5310 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-add.1,v 1.51 2010/02/10 23:20:38 markus Exp $
+.\" $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -37,7 +37,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: February 10 2010 $
+.Dd $Mdocdate: March 5 2010 $
.Dt SSH-ADD 1
.Os
.Sh NAME
@@ -61,7 +61,14 @@ When run without arguments, it adds the files
.Pa ~/.ssh/id_dsa
and
.Pa ~/.ssh/identity .
+After loading a private key,
+.Nm
+will try to load corresponding certificate information from the
+filename obtained by appending
+.Pa -cert.pub
+to the name of the private key file.
Alternative file names can be given on the command line.
+.Pp
If any file requires a passphrase,
.Nm
asks for the passphrase from the user.