diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-11-04 10:51:51 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-11-04 10:51:51 +1100 |
commit | e68cf84ac873f0b3fd566c55d6a915fd7843e76b (patch) | |
tree | 834ba39f7af52a96831a496861be8828e20afe0b | |
parent | 45c66d7ad4a06ffe85014c6522eebcede042e87f (diff) |
- djm@cvs.openbsd.org 2011/10/18 23:37:42
[ssh-add.c]
add -k to usage(); reminded by jmc@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh-add.c | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -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 @@ -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"); } |