diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:59:59 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:59:59 +1100 |
| commit | af1a60ec4f2b36ab960b8fd06483595742686ae9 (patch) | |
| tree | 18caa64e81c13f7b7e1cec8d438de75203f338f4 | |
| parent | 68afb8c5f242ec74f48fd86137122399435dd757 (diff) | |
- djm@cvs.openbsd.org 2011/09/25 05:44:47
[auth2-pubkey.c]
improve the AuthorizedPrincipalsFile debug log message to include
file and line number
| -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 @@ to connect to report: den at skbkontur.ru and P. Szczygielski feedback and ok djm@ + - djm@cvs.openbsd.org 2011/09/25 05:44:47 + [auth2-pubkey.c] + improve the AuthorizedPrincipalsFile debug log message to include + file and line number 20110929 - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 137887ec..5bccb5d7 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.29 2011/05/23 03:30:07 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.30 2011/09/25 05:44:47 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -238,8 +238,9 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) } for (i = 0; i < cert->nprincipals; i++) { if (strcmp(cp, cert->principals[i]) == 0) { - debug3("matched principal from file \"%.100s\"", - cert->principals[i]); + debug3("matched principal \"%.100s\" " + "from file \"%s\" on line %lu", + cert->principals[i], file, linenum); if (auth_parse_options(pw, line_opts, file, linenum) != 1) continue; @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.386 2011/09/09 22:38:21 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.387 2011/09/30 00:47:37 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2366,7 +2366,7 @@ cleanup_exit(int i) { if (the_authctxt) { do_cleanup(the_authctxt); - if (privsep_is_preauth && pmonitor->m_pid > 1) { + if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) { debug("Killing privsep child %d", pmonitor->m_pid); if (kill(pmonitor->m_pid, SIGKILL) != 0 && errno == ESRCH) |