- djm@cvs.openbsd.org 2011/10/18 23:37:42

     [ssh-add.c]
     add -k to usage(); reminded by jmc@

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e93ed2f6..21afdb5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - djm@cvs.openbsd.org 2011/10/18 05:15:28
      [ssh.c]
      ssh(1): skip attempting to create ~/.ssh when -F is passed; ok markus@
+   - djm@cvs.openbsd.org 2011/10/18 23:37:42
+     [ssh-add.c]
+     add -k to usage(); reminded by jmc@
 
 20111025
  - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file
diff --git a/ssh-add.c b/ssh-add.c
index ea7619e6a..738644d27 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.102 2011/10/18 05:00:48 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.103 2011/10/18 23:37:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -370,12 +370,13 @@ usage(void)
         fprintf(stderr, "Options:\n");
         fprintf(stderr, "  -l          List fingerprints of all identities.\n");
         fprintf(stderr, "  -L          List public key parameters of all identities.\n");
+        fprintf(stderr, "  -k          Load only keys and not certificates.\n");
+        fprintf(stderr, "  -c          Require confirmation to sign using identities\n");
+        fprintf(stderr, "  -t life     Set lifetime (in seconds) when adding identities.\n");
         fprintf(stderr, "  -d          Delete identity.\n");
         fprintf(stderr, "  -D          Delete all identities.\n");
         fprintf(stderr, "  -x          Lock agent.\n");
         fprintf(stderr, "  -X          Unlock agent.\n");
-        fprintf(stderr, "  -t life     Set lifetime (in seconds) when adding identities.\n");
-        fprintf(stderr, "  -c          Require confirmation to sign using identities\n");
         fprintf(stderr, "  -s pkcs11   Add keys from PKCS#11 provider.\n");
         fprintf(stderr, "  -e pkcs11   Remove keys provided by PKCS#11 provider.\n");
 }