diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:04:09 +0100 |
commit | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch) | |
tree | 13e783343edf688afffb4a8e02dc9685342b98a6 /auth-options.c | |
parent | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff) | |
parent | ff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff) |
merge 5.5p1
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 6 |
1 files changed, 3 insertions, 3 deletions
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++) { |