diff options
| author |   djm <djm@openbsd.org> | 2020-10-16 13:24:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-10-16 13:24:45 +0000 |
| commit | 321d5b75a2584757f5e5ced8f753f14b156d338a (patch) | |
| tree | e1e91b8f593a92061fac6ce4562fbfc96a917e9a /usr.bin/ssh/ssh-keyscan.c | |
| parent | remove uneeded pool.h include (diff) | |
| download | wireguard-openbsd-321d5b75a2584757f5e5ced8f753f14b156d338a.tar.xz wireguard-openbsd-321d5b75a2584757f5e5ced8f753f14b156d338a.zip | |
revised log infrastructure for OpenSSH
log functions receive function, filename and line number of caller.
We can use this to selectively enable logging via pattern-lists.
ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 108645a6a46..a362e397858 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.132 2020/08/12 01:23:45 cheloha Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.133 2020/10/16 13:24:45 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -617,14 +617,15 @@ do_host(char *host) } void -fatal(const char *fmt,...) +sshfatal(const char *file, const char *func, int line, + const char *fmt, ...) { va_list args; va_start(args, fmt); - do_log(SYSLOG_LEVEL_FATAL, fmt, args); + ssh_log(file, func, line, SYSLOG_LEVEL_FATAL, fmt, args); va_end(args); - exit(255); + cleanup_exit(255); } static void |