diff options
| author | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
| commit | 4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a (patch) | |
| tree | e8ca9ffe5bcb164be41a74f30a765b86bb38c885 /crypto/openssh/log.h | |
| parent | 1a954502d4f34f44a7b1d861ea2dadc117ca6a64 (diff) | |
| download | FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.zip FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.tar.gz | |
Merge conflicts.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/log.h')
| -rw-r--r-- | crypto/openssh/log.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/openssh/log.h b/crypto/openssh/log.h index ec64752..963f929 100644 --- a/crypto/openssh/log.h +++ b/crypto/openssh/log.h @@ -1,5 +1,5 @@ -/* $OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $ */ -/* $FreeBSD$ */ +/* $OpenBSD: log.h,v 1.15 2006/08/18 09:13:25 deraadt Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -16,8 +16,6 @@ #ifndef SSH_LOG_H #define SSH_LOG_H -#include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */ - /* Supported syslog facilities and levels. */ typedef enum { SYSLOG_FACILITY_DAEMON, @@ -64,6 +62,7 @@ LogLevel log_level_number(char *); void fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2))); void error(const char *, ...) __attribute__((format(printf, 1, 2))); +void sigdie(const char *, ...) __attribute__((format(printf, 1, 2))); void logit(const char *, ...) __attribute__((format(printf, 1, 2))); void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); void debug(const char *, ...) __attribute__((format(printf, 1, 2))); |
