diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth2-pubkey.c | 7 | ||||
-rw-r--r-- | sshd.c | 4 |
3 files changed, 10 insertions, 5 deletions
@@ -15,6 +15,10 @@ | |||
15 | to connect to | 15 | to connect to |
16 | report: den at skbkontur.ru and P. Szczygielski | 16 | report: den at skbkontur.ru and P. Szczygielski |
17 | feedback and ok djm@ | 17 | feedback and ok djm@ |
18 | - djm@cvs.openbsd.org 2011/09/25 05:44:47 | ||
19 | [auth2-pubkey.c] | ||
20 | improve the AuthorizedPrincipalsFile debug log message to include | ||
21 | file and line number | ||
18 | 22 | ||
19 | 20110929 | 23 | 20110929 |
20 | - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch | 24 | - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch |
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 137887ecd..5bccb5d76 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 | * |
@@ -238,8 +238,9 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) | |||
238 | } | 238 | } |
239 | for (i = 0; i < cert->nprincipals; i++) { | 239 | for (i = 0; i < cert->nprincipals; i++) { |
240 | if (strcmp(cp, cert->principals[i]) == 0) { | 240 | if (strcmp(cp, cert->principals[i]) == 0) { |
241 | debug3("matched principal from file \"%.100s\"", | 241 | debug3("matched principal \"%.100s\" " |
242 | cert->principals[i]); | 242 | "from file \"%s\" on line %lu", |
243 | cert->principals[i], file, linenum); | ||
243 | if (auth_parse_options(pw, line_opts, | 244 | if (auth_parse_options(pw, line_opts, |
244 | file, linenum) != 1) | 245 | file, linenum) != 1) |
245 | continue; | 246 | continue; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.386 2011/09/09 22:38:21 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.387 2011/09/30 00:47:37 dtucker 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 |
@@ -2366,7 +2366,7 @@ cleanup_exit(int i) | |||
2366 | { | 2366 | { |
2367 | if (the_authctxt) { | 2367 | if (the_authctxt) { |
2368 | do_cleanup(the_authctxt); | 2368 | do_cleanup(the_authctxt); |
2369 | if (privsep_is_preauth && pmonitor->m_pid > 1) { | 2369 | if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) { |
2370 | debug("Killing privsep child %d", pmonitor->m_pid); | 2370 | debug("Killing privsep child %d", pmonitor->m_pid); |
2371 | if (kill(pmonitor->m_pid, SIGKILL) != 0 && | 2371 | if (kill(pmonitor->m_pid, SIGKILL) != 0 && |
2372 | errno == ESRCH) | 2372 | errno == ESRCH) |