=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/log.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- src/usr.bin/ssh/log.h 2021/04/06 23:24:30 1.32 +++ src/usr.bin/ssh/log.h 2021/04/15 16:24:31 1.33 @@ -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 @@ -46,8 +46,7 @@ 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); @@ -79,6 +78,8 @@ 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__)