mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

- jakob@cvs.openbsd.org 2001/08/03 10:31:30

Browse Source 
[ssh-add.c ssh-agent.c ssh-keyscan.c]
     improve usage(). ok markus@
This commit is contained in:
Ben Lindstrom 2001-08-06 22:06:35 +00:00
parent e690121f0d
commit ddfb1e3a89
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -135,6 +135,9 @@
- jakob@cvs.openbsd.org 2001/08/03 10:31:19 - jakob@cvs.openbsd.org 2001/08/03 10:31:19
[ssh-add.1] [ssh-add.1]
document smartcard options. ok markus@ document smartcard options. ok markus@
- jakob@cvs.openbsd.org 2001/08/03 10:31:30
[ssh-add.c ssh-agent.c ssh-keyscan.c]
improve usage(). ok markus@
20010803 20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6245,4 +6248,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1461 2001/08/06 22:03:08 mouring Exp $ $Id: ChangeLog,v 1.1462 2001/08/06 22:06:35 mouring Exp $

21
ssh-add.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-add.c,v 1.44 2001/08/01 22:03:33 markus Exp $"); RCSID("$OpenBSD: ssh-add.c,v 1.45 2001/08/03 10:31:30 jakob Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -55,6 +55,9 @@ extern char *__progname;
char *__progname; char *__progname;
#endif #endif
/* argv0 */
extern char *__progname;
/* we keep a cache of one passphrases */ /* we keep a cache of one passphrases */
static char *pass = NULL; static char *pass = NULL;
static void static void
@ -195,12 +198,16 @@ list_identities(AuthenticationConnection *ac, int do_fp)
static void static void
usage(void) usage(void)
{ {
printf("Usage: ssh-add [options]\n"); fprintf(stderr, "Usage: %s [options]\n", __progname);
printf(" -l, -L : list identities\n"); fprintf(stderr, "Options:\n");
printf(" -d : delete identity\n"); fprintf(stderr, " -l List fingerprints of all identities.\n");
printf(" -D : delete all identities\n"); fprintf(stderr, " -L List public key parameters of all identities.\n");
printf(" -s reader_num : add key in the smartcard in reader_num.\n"); fprintf(stderr, " -d Delete identity.\n");
printf(" -e reader_num : remove key in the smartcard in reader_num.\n"); fprintf(stderr, " -D Delete all identities.\n");
#ifdef SMARTCARD
fprintf(stderr, " -s reader Add key in smartcard reader.\n");
fprintf(stderr, " -e reader Remove key in smartcard reader.\n");
#endif
} }
int int

12
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -36,7 +36,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $"); RCSID("$OpenBSD: ssh-agent.c,v 1.72 2001/08/03 10:31:30 jakob Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -821,9 +821,13 @@ check_parent_exists(int sig)
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, "ssh-agent version %s\n", SSH_VERSION); fprintf(stderr, "Usage: %s [options] [command [args ...]]\n",
fprintf(stderr, "Usage: %s [-c | -s] [-k] [-d] [command [args...]]\n",
__progname); __progname);
fprintf(stderr, "Options:\n");
fprintf(stderr, " -c Generate C-shell commands on stdout.\n");
fprintf(stderr, " -s Generate Bourne shell commands on stdout.\n");
fprintf(stderr, " -k Kill the current agent.\n");
fprintf(stderr, " -d Debug mode.\n");
exit(1); exit(1);
} }

10
ssh-keyscan.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keyscan.c,v 1.24 2001/06/23 15:12:20 itojun Exp $"); RCSID("$OpenBSD: ssh-keyscan.c,v 1.25 2001/08/03 10:31:30 jakob Exp $");
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h> #include <sys/queue.h>
@ -582,8 +582,12 @@ nexthost(int argc, char **argv)
static void static void
usage(void) usage(void)
{ {
fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname); fprintf(stderr, "Usage: %s [options] [ host | addrlist namelist ]\n",
return; __progname);
fprintf(stderr, "Options:\n");
fprintf(stderr, " -t timeout Set connection timeout.\n");
fprintf(stderr, " -f file Read hosts or addresses from file.\n");
exit(1);
} }
int int