diff options
author | dtucker <dtucker> | 2011-11-03 23:51:51 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2011-11-03 23:51:51 +0000 |
commit | aa7cf58c19dc70aab97553b7d36744747dbd6e08 (patch) | |
tree | ae0100f703cc828eb9b11f8f0f2b839e9a71fd3b | |
parent | 00d8551fbd5dc9533491facd6b8320b4be14733f (diff) | |
download | openssh-aa7cf58c19dc70aab97553b7d36744747dbd6e08.tar.gz |
- 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"); } |