diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-add.c | 4 | ||||
-rw-r--r-- | ssh-agent.1 | 28 | ||||
-rw-r--r-- | ssh-agent.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
5 files changed, 25 insertions, 21 deletions
@@ -33,6 +33,10 @@ | |||
33 | that accept a TCP connection but don't progress the protocol, and also | 33 | that accept a TCP connection but don't progress the protocol, and also |
34 | makes ConnectTimeout useful for connections via a ProxyCommand; | 34 | makes ConnectTimeout useful for connections via a ProxyCommand; |
35 | feedback and "looks ok" markus@ | 35 | feedback and "looks ok" markus@ |
36 | - sobrado@cvs.openbsd.org 2007/09/09 11:38:01 | ||
37 | [ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.c] | ||
38 | sort synopsis and options in ssh-agent(1); usage is lowercase | ||
39 | ok jmc@ | ||
36 | 40 | ||
37 | 20070914 | 41 | 20070914 |
38 | - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. | 42 | - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. |
@@ -3230,4 +3234,4 @@ | |||
3230 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3234 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3231 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3235 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3232 | 3236 | ||
3233 | $Id: ChangeLog,v 1.4749 2007/09/17 02:06:57 djm Exp $ | 3237 | $Id: ChangeLog,v 1.4750 2007/09/17 06:05:50 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.89 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.90 2007/09/09 11:38:01 sobrado 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 |
@@ -309,7 +309,7 @@ do_file(AuthenticationConnection *ac, int deleting, char *file) | |||
309 | static void | 309 | static void |
310 | usage(void) | 310 | usage(void) |
311 | { | 311 | { |
312 | fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname); | 312 | fprintf(stderr, "usage: %s [options] [file ...]\n", __progname); |
313 | fprintf(stderr, "Options:\n"); | 313 | fprintf(stderr, "Options:\n"); |
314 | fprintf(stderr, " -l List fingerprints of all identities.\n"); | 314 | fprintf(stderr, " -l List fingerprints of all identities.\n"); |
315 | fprintf(stderr, " -L List public key parameters of all identities.\n"); | 315 | fprintf(stderr, " -L List public key parameters of all identities.\n"); |
diff --git a/ssh-agent.1 b/ssh-agent.1 index 477d6883d..6a5dc62af 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.45 2007/05/31 19:20:16 jmc Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.46 2007/09/09 11:38:01 sobrado 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 |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .Dd $Mdocdate: May 31 2007 $ | 37 | .Dd $Mdocdate: June 5 2007 $ |
38 | .Dt SSH-AGENT 1 | 38 | .Dt SSH-AGENT 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -42,11 +42,11 @@ | |||
42 | .Nd authentication agent | 42 | .Nd authentication agent |
43 | .Sh SYNOPSIS | 43 | .Sh SYNOPSIS |
44 | .Nm ssh-agent | 44 | .Nm ssh-agent |
45 | .Op Fl a Ar bind_address | ||
46 | .Op Fl c Li | Fl s | 45 | .Op Fl c Li | Fl s |
47 | .Op Fl t Ar life | ||
48 | .Op Fl d | 46 | .Op Fl d |
49 | .Op Ar command Op Ar args ... | 47 | .Op Fl a Ar bind_address |
48 | .Op Fl t Ar life | ||
49 | .Op Ar command Op Ar arg ... | ||
50 | .Nm ssh-agent | 50 | .Nm ssh-agent |
51 | .Op Fl c Li | Fl s | 51 | .Op Fl c Li | Fl s |
52 | .Fl k | 52 | .Fl k |
@@ -77,16 +77,21 @@ Generate C-shell commands on | |||
77 | This is the default if | 77 | This is the default if |
78 | .Ev SHELL | 78 | .Ev SHELL |
79 | looks like it's a csh style of shell. | 79 | looks like it's a csh style of shell. |
80 | .It Fl d | ||
81 | Debug mode. | ||
82 | When this option is specified | ||
83 | .Nm | ||
84 | will not fork. | ||
85 | .It Fl k | ||
86 | Kill the current agent (given by the | ||
87 | .Ev SSH_AGENT_PID | ||
88 | environment variable). | ||
80 | .It Fl s | 89 | .It Fl s |
81 | Generate Bourne shell commands on | 90 | Generate Bourne shell commands on |
82 | .Dv stdout . | 91 | .Dv stdout . |
83 | This is the default if | 92 | This is the default if |
84 | .Ev SHELL | 93 | .Ev SHELL |
85 | does not look like it's a csh style of shell. | 94 | does not look like it's a csh style of shell. |
86 | .It Fl k | ||
87 | Kill the current agent (given by the | ||
88 | .Ev SSH_AGENT_PID | ||
89 | environment variable). | ||
90 | .It Fl t Ar life | 95 | .It Fl t Ar life |
91 | Set a default value for the maximum lifetime of identities added to the agent. | 96 | Set a default value for the maximum lifetime of identities added to the agent. |
92 | The lifetime may be specified in seconds or in a time format specified in | 97 | The lifetime may be specified in seconds or in a time format specified in |
@@ -95,11 +100,6 @@ A lifetime specified for an identity with | |||
95 | .Xr ssh-add 1 | 100 | .Xr ssh-add 1 |
96 | overrides this value. | 101 | overrides this value. |
97 | Without this option the default maximum lifetime is forever. | 102 | Without this option the default maximum lifetime is forever. |
98 | .It Fl d | ||
99 | Debug mode. | ||
100 | When this option is specified | ||
101 | .Nm | ||
102 | will not fork. | ||
103 | .El | 103 | .El |
104 | .Pp | 104 | .Pp |
105 | If a commandline is given, this is executed as a subprocess of the agent. | 105 | If a commandline is given, this is executed as a subprocess of the agent. |
diff --git a/ssh-agent.c b/ssh-agent.c index c3d5e5a75..fb12545b0 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.155 2007/03/19 12:16:42 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.156 2007/09/09 11:38:01 sobrado 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 |
@@ -1016,7 +1016,7 @@ check_parent_exists(void) | |||
1016 | static void | 1016 | static void |
1017 | usage(void) | 1017 | usage(void) |
1018 | { | 1018 | { |
1019 | fprintf(stderr, "Usage: %s [options] [command [args ...]]\n", | 1019 | fprintf(stderr, "usage: %s [options] [command [arg ...]]\n", |
1020 | __progname); | 1020 | __progname); |
1021 | fprintf(stderr, "Options:\n"); | 1021 | fprintf(stderr, "Options:\n"); |
1022 | fprintf(stderr, " -c Generate C-shell commands on stdout.\n"); | 1022 | fprintf(stderr, " -c Generate C-shell commands on stdout.\n"); |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 04a9b939a..95b0ac850 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.160 2007/01/21 01:41:54 stevesk Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.161 2007/09/09 11:38:01 sobrado Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1006,7 +1006,7 @@ do_change_comment(struct passwd *pw) | |||
1006 | static void | 1006 | static void |
1007 | usage(void) | 1007 | usage(void) |
1008 | { | 1008 | { |
1009 | fprintf(stderr, "Usage: %s [options]\n", __progname); | 1009 | fprintf(stderr, "usage: %s [options]\n", __progname); |
1010 | fprintf(stderr, "Options:\n"); | 1010 | fprintf(stderr, "Options:\n"); |
1011 | fprintf(stderr, " -a trials Number of trials for screening DH-GEX moduli.\n"); | 1011 | fprintf(stderr, " -a trials Number of trials for screening DH-GEX moduli.\n"); |
1012 | fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); | 1012 | fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); |