diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 22:06:35 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 22:06:35 +0000 |
commit | ddfb1e3a892f450178093964f11cdc534340a56a (patch) | |
tree | bd4792fa1c6e3db400a59e629086fa1bb74a6c65 | |
parent | e690121f0de556b0e4595630540ab0ae52115c0d (diff) |
- jakob@cvs.openbsd.org 2001/08/03 10:31:30
[ssh-add.c ssh-agent.c ssh-keyscan.c]
improve usage(). ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-add.c | 21 | ||||
-rw-r--r-- | ssh-agent.c | 12 | ||||
-rw-r--r-- | ssh-keyscan.c | 10 |
4 files changed, 33 insertions, 15 deletions
@@ -135,6 +135,9 @@ | |||
135 | - jakob@cvs.openbsd.org 2001/08/03 10:31:19 | 135 | - jakob@cvs.openbsd.org 2001/08/03 10:31:19 |
136 | [ssh-add.1] | 136 | [ssh-add.1] |
137 | document smartcard options. ok markus@ | 137 | document smartcard options. ok markus@ |
138 | - jakob@cvs.openbsd.org 2001/08/03 10:31:30 | ||
139 | [ssh-add.c ssh-agent.c ssh-keyscan.c] | ||
140 | improve usage(). ok markus@ | ||
138 | 141 | ||
139 | 20010803 | 142 | 20010803 |
140 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 143 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6245,4 +6248,4 @@ | |||
6245 | - Wrote replacements for strlcpy and mkdtemp | 6248 | - Wrote replacements for strlcpy and mkdtemp |
6246 | - Released 1.0pre1 | 6249 | - Released 1.0pre1 |
6247 | 6250 | ||
6248 | $Id: ChangeLog,v 1.1461 2001/08/06 22:03:08 mouring Exp $ | 6251 | $Id: ChangeLog,v 1.1462 2001/08/06 22:06:35 mouring Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.44 2001/08/01 22:03:33 markus Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.45 2001/08/03 10:31:30 jakob Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -55,6 +55,9 @@ extern char *__progname; | |||
55 | char *__progname; | 55 | char *__progname; |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | /* argv0 */ | ||
59 | extern char *__progname; | ||
60 | |||
58 | /* we keep a cache of one passphrases */ | 61 | /* we keep a cache of one passphrases */ |
59 | static char *pass = NULL; | 62 | static char *pass = NULL; |
60 | static void | 63 | static void |
@@ -195,12 +198,16 @@ list_identities(AuthenticationConnection *ac, int do_fp) | |||
195 | static void | 198 | static void |
196 | usage(void) | 199 | usage(void) |
197 | { | 200 | { |
198 | printf("Usage: ssh-add [options]\n"); | 201 | fprintf(stderr, "Usage: %s [options]\n", __progname); |
199 | printf(" -l, -L : list identities\n"); | 202 | fprintf(stderr, "Options:\n"); |
200 | printf(" -d : delete identity\n"); | 203 | fprintf(stderr, " -l List fingerprints of all identities.\n"); |
201 | printf(" -D : delete all identities\n"); | 204 | fprintf(stderr, " -L List public key parameters of all identities.\n"); |
202 | printf(" -s reader_num : add key in the smartcard in reader_num.\n"); | 205 | fprintf(stderr, " -d Delete identity.\n"); |
203 | printf(" -e reader_num : remove key in the smartcard in reader_num.\n"); | 206 | fprintf(stderr, " -D Delete all identities.\n"); |
207 | #ifdef SMARTCARD | ||
208 | fprintf(stderr, " -s reader Add key in smartcard reader.\n"); | ||
209 | fprintf(stderr, " -e reader Remove key in smartcard reader.\n"); | ||
210 | #endif | ||
204 | } | 211 | } |
205 | 212 | ||
206 | int | 213 | int |
diff --git a/ssh-agent.c b/ssh-agent.c index 3e8eb0601..a004e3246 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $"); | 39 | RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $"); |
40 | 40 | ||
41 | #include <openssl/evp.h> | 41 | #include <openssl/evp.h> |
42 | #include <openssl/md5.h> | 42 | #include <openssl/md5.h> |
@@ -821,9 +821,13 @@ check_parent_exists(int sig) | |||
821 | static void | 821 | static void |
822 | usage(void) | 822 | usage(void) |
823 | { | 823 | { |
824 | fprintf(stderr, "ssh-agent version %s\n", SSH_VERSION); | 824 | fprintf(stderr, "Usage: %s [options] [command [args ...]]\n", |
825 | fprintf(stderr, "Usage: %s [-c | -s] [-k] [-d] [command [args...]]\n", | ||
826 | __progname); | 825 | __progname); |
826 | fprintf(stderr, "Options:\n"); | ||
827 | fprintf(stderr, " -c Generate C-shell commands on stdout.\n"); | ||
828 | fprintf(stderr, " -s Generate Bourne shell commands on stdout.\n"); | ||
829 | fprintf(stderr, " -k Kill the current agent.\n"); | ||
830 | fprintf(stderr, " -d Debug mode.\n"); | ||
827 | exit(1); | 831 | exit(1); |
828 | } | 832 | } |
829 | 833 | ||
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 9f7aa94aa..9908baac4 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.24 2001/06/23 15:12:20 itojun Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.25 2001/08/03 10:31:30 jakob Exp $"); |
11 | 11 | ||
12 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | 12 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) |
13 | #include <sys/queue.h> | 13 | #include <sys/queue.h> |
@@ -582,8 +582,12 @@ nexthost(int argc, char **argv) | |||
582 | static void | 582 | static void |
583 | usage(void) | 583 | usage(void) |
584 | { | 584 | { |
585 | fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname); | 585 | fprintf(stderr, "Usage: %s [options] [ host | addrlist namelist ]\n", |
586 | return; | 586 | __progname); |
587 | fprintf(stderr, "Options:\n"); | ||
588 | fprintf(stderr, " -t timeout Set connection timeout.\n"); | ||
589 | fprintf(stderr, " -f file Read hosts or addresses from file.\n"); | ||
590 | exit(1); | ||
587 | } | 591 | } |
588 | 592 | ||
589 | int | 593 | int |