From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 16 Oct 2020 02:37:12 +0000 (+0000)
Subject: upstream: use do_log2 instead of function pointers to different log
X-Git-Tag: V_8_5_P1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acadbb3402b70f72f14d9a6930ad41be97c2f9dc;p=thirdparty%2Fopenssh-portable.git

upstream: use do_log2 instead of function pointers to different log

functions

OpenBSD-Commit-ID: 88077b826d348c58352a6b394755520f4e484480
---

diff --git a/sshconnect2.c b/sshconnect2.c
index 6da2248f5..9e3bd05c9 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -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) 2008 Damien Miller.  All rights reserved.
@@ -1515,8 +1515,9 @@ load_identity_file(Identity *id)
 	struct stat st;
 
 	if (stat(id->filename, &st) == -1) {
-		(id->userprovided ? logit : debug3)("no such identity: %s: %s",
-		    id->filename, strerror(errno));
+		do_log2(id->userprovided ?
+		    SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_DEBUG3,
+		    "no such identity: %s: %s", id->filename, strerror(errno));
 		return NULL;
 	}
 	snprintf(prompt, sizeof prompt,