diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-10-18 13:21:59 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-10-18 13:34:20 +0200 |
| commit | 9e2c4f64224f68fb84c49b5182e449f94b0dc985 (patch) | |
| tree | aa4a81152c6f6a3f06e466024680788f87069f56 /monitor.c | |
| parent | upstream: remove a level of macro indirection; ok markus@ (diff) | |
| download | openssh-9e2c4f64224f68fb84c49b5182e449f94b0dc985.tar.xz openssh-9e2c4f64224f68fb84c49b5182e449f94b0dc985.zip | |
upstream: variants of the log methods that append a ssherr.h string
from a supplied error code; ok markus@
OpenBSD-Commit-ID: aed98c4435d48d036ae6740300f6a8357b7cc0bf
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.215 2020/10/16 13:24:45 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.216 2020/10/18 11:21:59 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -461,9 +461,8 @@ monitor_read_log(struct monitor *pmonitor) /* Log it */ if (log_level_name(level) == NULL) - fatal("%s: invalid log level %u (corrupted message?)", - __func__, level); - sshlog(file, func, line, 0, level, "%s [preauth]", msg); + fatal_f("invalid log level %u (corrupted message?)", level); + sshlog(file, func, line, 0, level, NULL, "%s [preauth]", msg); sshbuf_free(logmsg); free(file); |