mirror of git://anongit.mindrot.org/openssh.git
upstream: short circuit debug log processing early if we're not going
to log anything. From Kobe Housen OpenBSD-Commit-ID: 2bcddd695872a1bef137cfff7823044dcded90ea
This commit is contained in:
parent
947affad48
commit
19d3ee2f3a
6
log.c
6
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>
|
* 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
|
||||||
|
@ -469,6 +469,10 @@ sshlogv(const char *file, const char *func, int line, int showfunc,
|
||||||
const char *cp;
|
const char *cp;
|
||||||
size_t i;
|
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)",
|
snprintf(tag, sizeof(tag), "%.48s:%.48s():%d (pid=%ld)",
|
||||||
(cp = strrchr(file, '/')) == NULL ? file : cp + 1, func, line,
|
(cp = strrchr(file, '/')) == NULL ? file : cp + 1, func, line,
|
||||||
(long)getpid());
|
(long)getpid());
|
||||||
|
|
Loading…
Reference in New Issue