diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /auth2-pubkey.c | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index a1d31e930..d42ba14b8 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.29 2011/05/23 03:30:07 djm Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.30 2011/09/25 05:44:47 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -239,8 +239,9 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) | |||
239 | } | 239 | } |
240 | for (i = 0; i < cert->nprincipals; i++) { | 240 | for (i = 0; i < cert->nprincipals; i++) { |
241 | if (strcmp(cp, cert->principals[i]) == 0) { | 241 | if (strcmp(cp, cert->principals[i]) == 0) { |
242 | debug3("matched principal from file \"%.100s\"", | 242 | debug3("matched principal \"%.100s\" " |
243 | cert->principals[i]); | 243 | "from file \"%s\" on line %lu", |
244 | cert->principals[i], file, linenum); | ||
244 | if (auth_parse_options(pw, line_opts, | 245 | if (auth_parse_options(pw, line_opts, |
245 | file, linenum) != 1) | 246 | file, linenum) != 1) |
246 | continue; | 247 | continue; |