- (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5)

[openssh.git] / log.h

diff --git a/log.h b/log.h
index 95ec864f323d85d93088f0e53011dba7909a92b5..7a8c57079cca6242938bc18ce901143c5996be43 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: log.h,v 1.3 2001/06/26 06:32:55 itojun Exp $  */
+/* $OpenBSD: log.h,v 1.15 2006/08/18 09:13:25 deraadt Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,8 +15,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,
@@ -32,7 +30,8 @@ typedef enum {
        SYSLOG_FACILITY_LOCAL4,
        SYSLOG_FACILITY_LOCAL5,
        SYSLOG_FACILITY_LOCAL6,
-       SYSLOG_FACILITY_LOCAL7
+       SYSLOG_FACILITY_LOCAL7,
+       SYSLOG_FACILITY_NOT_SET = -1
 }       SyslogFacility;
 
 typedef enum {
@@ -43,38 +42,24 @@ typedef enum {
        SYSLOG_LEVEL_VERBOSE,
        SYSLOG_LEVEL_DEBUG1,
        SYSLOG_LEVEL_DEBUG2,
-       SYSLOG_LEVEL_DEBUG3
+       SYSLOG_LEVEL_DEBUG3,
+       SYSLOG_LEVEL_NOT_SET = -1
 }       LogLevel;
-/* Initializes logging. */
-void    log_init(char *, LogLevel, SyslogFacility, int);
 
-/* Logging implementation, depending on server or client */
-void    do_log(LogLevel, const char *, va_list);
+void     log_init(char *, LogLevel, SyslogFacility, int);
 
-/* name to facility/level */
-SyslogFacility log_facility_number(char *);
+SyslogFacility log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-/* Output a message to syslog or stderr */
-void    fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
-void    error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void    log(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)));
-void    debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
-void    debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
-
-/* same as fatal() but w/o logging */
-void    fatal_cleanup(void);
-
-/*
- * Registers a cleanup function to be called by fatal()/fatal_cleanup()
- * before exiting. It is permissible to call fatal_remove_cleanup for the
- * function itself from the function.
- */
-void    fatal_add_cleanup(void (*) (void *), void *);
-
-/* Removes a cleanup function to be called at fatal(). */
-void    fatal_remove_cleanup(void (*) (void *), void *);
+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)));
+void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
+void    do_log(LogLevel, const char *, va_list);
+void    cleanup_exit(int) __dead;
 #endif