tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Darren Tucker 2011-10-02 18:59:59 +11:00
parent 68afb8c5f2
commit af1a60ec4f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,6 +15,10 @@
to connect to to connect to
report: den at skbkontur.ru and P. Szczygielski report: den at skbkontur.ru and P. Szczygielski
feedback and ok djm@ 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 20110929
- (djm) [configure.ac defines.h] No need to detect sizeof(char); patch - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch

7
auth2-pubkey.c
View File

@ -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. * 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++) { for (i = 0; i < cert->nprincipals; i++) {
if (strcmp(cp, cert->principals[i]) == 0) { if (strcmp(cp, cert->principals[i]) == 0) {
debug3("matched principal from file \"%.100s\"", debug3("matched principal \"%.100s\" "
cert->principals[i]); "from file \"%s\" on line %lu",
cert->principals[i], file, linenum);
if (auth_parse_options(pw, line_opts, if (auth_parse_options(pw, line_opts,
file, linenum) != 1) file, linenum) != 1)
continue; continue;

4
sshd.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2366,7 +2366,7 @@ cleanup_exit(int i)
{ {
if (the_authctxt) { if (the_authctxt) {
do_cleanup(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); debug("Killing privsep child %d", pmonitor->m_pid);
if (kill(pmonitor->m_pid, SIGKILL) != 0 && if (kill(pmonitor->m_pid, SIGKILL) != 0 &&
errno == ESRCH) errno == ESRCH)