RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2010-03-05 10:42:24 +11:00
parent a7dab8bfe5
commit 689b872842
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -16,6 +16,10 @@
[ssh.1 sshd.8] [ssh.1 sshd.8]
move section on CA and revoked keys from ssh.1 to sshd.8's known hosts 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@ 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 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
compilers. OK djm@ compilers. OK djm@

4
auth-options.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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) { if (cert_forced_command != NULL) {
error("Certificate has multiple " error("Certificate has multiple "
"forced-command constraints"); "force-command constraints");
xfree(command); xfree(command);
goto out; goto out;
} }

4
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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) if ((constraint_flags & CONSTRAINT_USER_RC) != 0)
add_flag_constraint(c, "permit-user-rc"); add_flag_constraint(c, "permit-user-rc");
if (constraint_command != NULL) 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) if (constraint_src_addr != NULL)
add_string_constraint(c, "source-address", constraint_src_addr); add_string_constraint(c, "source-address", constraint_src_addr);
} }