From: djm <djm@openbsd.org>
Date: Wed, 6 Dec 2023 21:06:48 +0000 (+0000)
Subject: short circuit debug log processing early if we're not going to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2daf5781f4679528d733e79751b63a3e682f57d4;p=openbsd

short circuit debug log processing early if we're not going to
log anything. From Kobe Housen
---

diff --git a/usr.bin/ssh/log.c b/usr.bin/ssh/log.c
index dd704437a9e..57d7d166b5d 100644
--- a/usr.bin/ssh/log.c
+++ b/usr.bin/ssh/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.60 2021/09/16 15:11:19 djm Exp $ */
+/* $OpenBSD: log.c,v 1.61 2023/12/06 21:06:48 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -427,6 +427,10 @@ sshlogv(const char *file, const char *func, int line, int showfunc,
 	const char *cp;
 	size_t i;
 
+	/* short circuit processing early if we're not going to log anything */
+	if (nlog_verbose == 0 && level > log_level)
+		return;
+
 	snprintf(tag, sizeof(tag), "%.48s:%.48s():%d (pid=%ld)",
 	    (cp = strrchr(file, '/')) == NULL ? file : cp + 1, func, line,
 	    (long)getpid());