diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-03-05 10:28:22 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-03-05 10:28:22 +0000 |
| commit | 8e286dc0f07dd07b60903a9cb75e519df405d439 (patch) | |
| tree | d6cd39a2d0395c71b9941e8c9e5ecd3cba5efc4f /usr.bin/ssh/ssh-add.1 | |
| parent | 04136c71b3fec3f81367a1a19c4f6679a16442fd (diff) | |
mention loading of certificate files from [private]-cert.pub when
they are present; feedback and ok jmc@
Diffstat (limited to 'usr.bin/ssh/ssh-add.1')
| -rw-r--r-- | usr.bin/ssh/ssh-add.1 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1 index 0d5e39272f0..d7cc53101f8 100644 --- a/usr.bin/ssh/ssh-add.1 +++ b/usr.bin/ssh/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. |