diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2021-04-15 18:24:31 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-04-16 05:24:33 +0200 |
| commit | faf2b86a46c9281d237bcdec18c99e94a4eb820a (patch) | |
| tree | 31f662f8992fcde2c429d3cb6619f0be6349ae27 /log.h | |
| parent | sshd don't exit on transient read errors (diff) | |
| download | openssh-faf2b86a46c9281d237bcdec18c99e94a4eb820a.tar.xz openssh-faf2b86a46c9281d237bcdec18c99e94a4eb820a.zip | |
upstream: do not pass file/func to monitor; noted by Ilja van Sprundel;
ok djm@
OpenBSD-Commit-ID: 85ae5c063845c410283cbdce685515dcd19479fa
Diffstat (limited to 'log.h')
| -rw-r--r-- | log.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.32 2021/04/06 23:24:30 djm Exp $ */ +/* $OpenBSD: log.h,v 1.33 2021/04/15 16:24:31 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -49,8 +49,7 @@ typedef enum { SYSLOG_LEVEL_NOT_SET = -1 } LogLevel; -typedef void (log_handler_fn)(const char *, const char *, int, LogLevel, - const char *, void *); +typedef void (log_handler_fn)(LogLevel, int, const char *, void *); void log_init(const char *, LogLevel, SyslogFacility, int); LogLevel log_level_get(void); @@ -82,6 +81,8 @@ void sshlogdie(const char *, const char *, int, int, void sshfatal(const char *, const char *, int, int, LogLevel, const char *, const char *, ...) __attribute__((noreturn)) __attribute__((format(printf, 7, 8))); +void sshlogdirect(LogLevel, int, const char *, ...) + __attribute__((format(printf, 3, 4))); #define do_log2(level, ...) sshlog(__FILE__, __func__, __LINE__, 0, level, NULL, __VA_ARGS__) #define debug3(...) sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG3, NULL, __VA_ARGS__) |