RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[ssh-add.c]
     add -k to usage(); reminded by jmc@
This commit is contained in:
Darren Tucker 2011-11-04 10:51:51 +11:00
parent 45c66d7ad4
commit e68cf84ac8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
- djm@cvs.openbsd.org 2011/10/18 05:15:28 - djm@cvs.openbsd.org 2011/10/18 05:15:28
[ssh.c] [ssh.c]
ssh(1): skip attempting to create ~/.ssh when -F is passed; ok markus@ 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 20111025
- (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file

7
ssh-add.c
View 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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -370,12 +370,13 @@ usage(void)
fprintf(stderr, "Options:\n"); fprintf(stderr, "Options:\n");
fprintf(stderr, " -l List fingerprints of all identities.\n"); fprintf(stderr, " -l List fingerprints of all identities.\n");
fprintf(stderr, " -L List public key parameters 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 identity.\n");
fprintf(stderr, " -D Delete all identities.\n"); fprintf(stderr, " -D Delete all identities.\n");
fprintf(stderr, " -x Lock agent.\n"); fprintf(stderr, " -x Lock agent.\n");
fprintf(stderr, " -X Unlock 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, " -s pkcs11 Add keys from PKCS#11 provider.\n");
fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n"); fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
} }