diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-options.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -16,6 +16,10 @@ | |||
16 | [ssh.1 sshd.8] | 16 | [ssh.1 sshd.8] |
17 | move section on CA and revoked keys from ssh.1 to sshd.8's known hosts | 17 | move section on CA and revoked keys from ssh.1 to sshd.8's known hosts |
18 | format section and rework it a bit; requested by jmc@ | 18 | format section and rework it a bit; requested by jmc@ |
19 | - djm@cvs.openbsd.org 2010/03/04 23:27:25 | ||
20 | [auth-options.c ssh-keygen.c] | ||
21 | "force-command" is not spelled "forced-command"; spotted by | ||
22 | imorgan AT nas.nasa.gov | ||
19 | - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older | 23 | - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older |
20 | compilers. OK djm@ | 24 | compilers. OK djm@ |
21 | 25 | ||
diff --git a/auth-options.c b/auth-options.c index d14624bf4..bcf5589d7 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.46 2010/03/03 01:44:36 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.47 2010/03/04 23:27:25 djm 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 |
@@ -446,7 +446,7 @@ auth_cert_constraints(Buffer *c_orig, struct passwd *pw) | |||
446 | } | 446 | } |
447 | if (cert_forced_command != NULL) { | 447 | if (cert_forced_command != NULL) { |
448 | error("Certificate has multiple " | 448 | error("Certificate has multiple " |
449 | "forced-command constraints"); | 449 | "force-command constraints"); |
450 | xfree(command); | 450 | xfree(command); |
451 | goto out; | 451 | goto out; |
452 | } | 452 | } |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 492c301d3..fc7ca4b0c 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.182 2010/03/04 20:35:08 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.183 2010/03/04 23:27:25 djm 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 |
@@ -1142,7 +1142,7 @@ prepare_constraint_buf(Buffer *c) | |||
1142 | if ((constraint_flags & CONSTRAINT_USER_RC) != 0) | 1142 | if ((constraint_flags & CONSTRAINT_USER_RC) != 0) |
1143 | add_flag_constraint(c, "permit-user-rc"); | 1143 | add_flag_constraint(c, "permit-user-rc"); |
1144 | if (constraint_command != NULL) | 1144 | if (constraint_command != NULL) |
1145 | add_string_constraint(c, "forced-command", constraint_command); | 1145 | add_string_constraint(c, "force-command", constraint_command); |
1146 | if (constraint_src_addr != NULL) | 1146 | if (constraint_src_addr != NULL) |
1147 | add_string_constraint(c, "source-address", constraint_src_addr); | 1147 | add_string_constraint(c, "source-address", constraint_src_addr); |
1148 | } | 1148 | } |