summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 10:42:24 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 10:42:24 +1100
commit689b872842ba2e64d2bf52abe0c9b1b1f6a6663f (patch)
treea4a0a8e42eea6d5d7aec6789cc03dd5ada2d8c30
parenta7dab8bfe571e6ee0b53e0852336f8a758b95c61 (diff)
- djm@cvs.openbsd.org 2010/03/04 23:27:25
[auth-options.c ssh-keygen.c] "force-command" is not spelled "forced-command"; spotted by imorgan AT nas.nasa.gov
-rw-r--r--ChangeLog4
-rw-r--r--auth-options.c4
-rw-r--r--ssh-keygen.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c441b201..7b50de5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
[ssh.1 sshd.8]
move section on CA and revoked keys from ssh.1 to sshd.8's known hosts
format section and rework it a bit; requested by jmc@
+ - djm@cvs.openbsd.org 2010/03/04 23:27:25
+ [auth-options.c ssh-keygen.c]
+ "force-command" is not spelled "forced-command"; spotted by
+ imorgan AT nas.nasa.gov
- (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
compilers. OK djm@
diff --git a/auth-options.c b/auth-options.c
index d14624bf..bcf5589d 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.46 2010/03/03 01:44:36 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.47 2010/03/04 23:27:25 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -446,7 +446,7 @@ auth_cert_constraints(Buffer *c_orig, struct passwd *pw)
}
if (cert_forced_command != NULL) {
error("Certificate has multiple "
- "forced-command constraints");
+ "force-command constraints");
xfree(command);
goto out;
}
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 492c301d..fc7ca4b0 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.182 2010/03/04 20:35:08 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.183 2010/03/04 23:27:25 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1142,7 +1142,7 @@ prepare_constraint_buf(Buffer *c)
if ((constraint_flags & CONSTRAINT_USER_RC) != 0)
add_flag_constraint(c, "permit-user-rc");
if (constraint_command != NULL)
- add_string_constraint(c, "forced-command", constraint_command);
+ add_string_constraint(c, "force-command", constraint_command);
if (constraint_src_addr != NULL)
add_string_constraint(c, "source-address", constraint_src_addr);
}