summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--auth-options.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 22bb981bf..8e295ca5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 [key.c key.h ssh-keygen.c] 34 [key.c key.h ssh-keygen.c]
35 also print certificate type (user or host) for ssh-keygen -L 35 also print certificate type (user or host) for ssh-keygen -L
36 ok djm kettenis 36 ok djm kettenis
37 - stevesk@cvs.openbsd.org 2010/03/16 15:46:52
38 [auth-options.c]
39 spelling in error message. ok djm kettenis
37 40
3820100314 4120100314
39 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix 42 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/auth-options.c b/auth-options.c
index 129301765..69b314fbd 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.48 2010/03/07 11:57:13 dtucker Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.49 2010/03/16 15:46:52 stevesk 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
@@ -434,7 +434,7 @@ auth_cert_constraints(Buffer *c_orig, struct passwd *pw)
434 goto out; 434 goto out;
435 } 435 }
436 if (strlen(command) != clen) { 436 if (strlen(command) != clen) {
437 error("force-command constrain contains \\0"); 437 error("force-command constraint contains \\0");
438 goto out; 438 goto out;
439 } 439 }
440 if (cert_forced_command != NULL) { 440 if (cert_forced_command != NULL) {
@@ -454,7 +454,7 @@ auth_cert_constraints(Buffer *c_orig, struct passwd *pw)
454 goto out; 454 goto out;
455 } 455 }
456 if (strlen(allowed) != clen) { 456 if (strlen(allowed) != clen) {
457 error("source-address constrain contains \\0"); 457 error("source-address constraint contains \\0");
458 goto out; 458 goto out;
459 } 459 }
460 if (cert_source_address_done++) { 460 if (cert_source_address_done++) {