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

upstream: use do_log2 instead of function pointers to different log 

functions

OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480
This commit is contained in:
djm@openbsd.org 2020-10-16 02:37:12 +00:00 committed by Damien Miller
parent 95b0bcfd15
commit acadbb3402
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.329 2020/10/07 02:22:23 djm Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.330 2020/10/16 02:37:12 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -1515,8 +1515,9 @@ load_identity_file(Identity *id)
struct stat st; struct stat st;
if (stat(id->filename, &st) == -1) { if (stat(id->filename, &st) == -1) {
(id->userprovided ? logit : debug3)("no such identity: %s: %s", do_log2(id->userprovided ?
id->filename, strerror(errno)); SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_DEBUG3,
"no such identity: %s: %s", id->filename, strerror(errno));
return NULL; return NULL;
} }
snprintf(prompt, sizeof prompt, snprintf(prompt, sizeof prompt,