summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-add.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8124065c3..0557b0fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
30 - jmc@cvs.openbsd.org 2006/05/29 16:13:23 30 - jmc@cvs.openbsd.org 2006/05/29 16:13:23
31 [ssh.1] 31 [ssh.1]
32 add GSSAPI to the list of authentication methods supported; 32 add GSSAPI to the list of authentication methods supported;
33 - mk@cvs.openbsd.org 2006/05/30 11:46:38
34 [ssh-add.c]
35 Sync usage() with man page and reality.
36 ok deraadt dtucker
33 37
3420060521 3820060521
35 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 39 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4663,4 +4667,4 @@
4663 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4667 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4664 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4668 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4665 4669
4666$Id: ChangeLog,v 1.4338 2006/06/13 03:03:16 djm Exp $ 4670$Id: ChangeLog,v 1.4339 2006/06/13 03:03:34 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index ff85af031..836cb5f9c 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.79 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.80 2006/05/30 11:46:38 mk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -299,7 +299,7 @@ do_file(AuthenticationConnection *ac, int deleting, char *file)
299static void 299static void
300usage(void) 300usage(void)
301{ 301{
302 fprintf(stderr, "Usage: %s [options]\n", __progname); 302 fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);
303 fprintf(stderr, "Options:\n"); 303 fprintf(stderr, "Options:\n");
304 fprintf(stderr, " -l List fingerprints of all identities.\n"); 304 fprintf(stderr, " -l List fingerprints of all identities.\n");
305 fprintf(stderr, " -L List public key parameters of all identities.\n"); 305 fprintf(stderr, " -L List public key parameters of all identities.\n");