-#define LOGUSER(app) openlog(app,LOG_PERROR,LOG_USER)
-#define LOGAUTH(app) openlog(app,LOG_PERROR,LOG_AUTH)
-#define ERROR(...) syslog(LOG_ERR,__VA_ARGS__)
-#define WARNING(...) do{if(verbosity)syslog(LOG_WARNING,__VA_ARGS__);}while(0)
-#define NOTICE(...) do{if(verbosity)syslog(LOG_NOTICE,__VA_ARGS__);}while(0)
-#define INFO(...) do{if(verbosity>1)syslog(LOG_INFO,__VA_ARGS__);}while(0)
-#define DEBUG(...) do{if(verbosity>2)syslog(LOG_DEBUG,__VA_ARGS__);}while(0)
+
+enum verbosity_levels
+{
+ Verbosity_Level_Error = 0,
+ Verbosity_Level_Warning = 1,
+ Verbosity_Level_Notice = 2,
+ Verbosity_Level_Info = 3,
+ Verbosity_Level_Debug = 4
+};
+*/
+
+extern void verbose_set_name(const char *name, int authority);
+
+/*
+ Log level is defined by syslog standard:
+ KERN_EMERG 0 System is unusable
+ KERN_ALERT 1 Action must be taken immediately
+ KERN_CRIT 2 Critical conditions
+ KERN_ERR 3 Error conditions
+ KERN_WARNING 4 Warning conditions
+ KERN_NOTICE 5 Normal but significant condition
+ KERN_INFO 6 Informational
+ KERN_DEBUG 7 Debug-level messages
+*/
+
+enum
+{
+ Log_Level_Emergency = 0,
+ Log_Level_Alert = 1,
+ Log_Level_Critical = 2,
+ Log_Level_Error = 3,
+ Log_Level_Warning = 4,
+ Log_Level_Notice = 5,
+ Log_Level_Info = 6,
+ Log_Level_Debug = 7
+};
+
+extern int logmask;
+
+extern void verbose(int loglevel, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
+extern void vverbose(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args);
+
+#if defined(VERBOSE_NO_DATA)
+# define __VERBOSE__(lvl,...) do{if((lvl)<=Log_Level_Error) verbose(lvl, __FILE__, __LINE__, NULL, __VA_ARGS__)\
+ else verbose(lvl, __FILE__, __LINE__, NULL, NULL);}while(0)
+#elif defined(VERBOSE_NO_DETAILS)
+# define __VERBOSE__(lvl,...) verbose(lvl, NULL, 0, NULL, __VA_ARGS__)