From faf2b86a46c9281d237bcdec18c99e94a4eb820a Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Thu, 15 Apr 2021 16:24:31 +0000 Subject: upstream: do not pass file/func to monitor; noted by Ilja van Sprundel; ok djm@ OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa --- monitor.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index a464fcc8..1a00d459 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.224 2021/03/03 22:41:49 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.225 2021/04/15 16:24:31 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -417,8 +417,8 @@ static int monitor_read_log(struct monitor *pmonitor) { struct sshbuf *logmsg; - u_int len, level, line; - char *msg, *file, *func; + u_int len, level, forced; + char *msg; u_char *p; int r; @@ -449,21 +449,17 @@ monitor_read_log(struct monitor *pmonitor) fatal_fr(r, "reserve msg"); if (atomicio(read, pmonitor->m_log_recvfd, p, len) != len) fatal_f("log fd read: %s", strerror(errno)); - if ((r = sshbuf_get_cstring(logmsg, &file, NULL)) != 0 || - (r = sshbuf_get_cstring(logmsg, &func, NULL)) != 0 || - (r = sshbuf_get_u32(logmsg, &line)) != 0 || - (r = sshbuf_get_u32(logmsg, &level)) != 0 || + if ((r = sshbuf_get_u32(logmsg, &level)) != 0 || + (r = sshbuf_get_u32(logmsg, &forced)) != 0 || (r = sshbuf_get_cstring(logmsg, &msg, NULL)) != 0) fatal_fr(r, "parse"); /* Log it */ if (log_level_name(level) == NULL) fatal_f("invalid log level %u (corrupted message?)", level); - sshlog(file, func, line, 0, level, NULL, "%s [preauth]", msg); + sshlogdirect(level, forced, "%s [preauth]", msg); sshbuf_free(logmsg); - free(file); - free(func); free(msg); return 0; -- cgit v1.2.1