summaryrefslogtreecommitdiffabout
path: root/src/main.c
authorSergey Poznyakoff <gray@gnu.org.ua>2007-06-30 07:12:15 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2007-06-30 07:12:15 (GMT)
commit7929af051a38ff8c79edc8166c2dc6256053c461 (patch) (side-by-side diff)
treed9f94f087326fd11ad05ea2053bef1d9ef45da08 /src/main.c
parent184e9cca3cc12a900f2da25dc3850c6e3f7119c8 (diff)
downloadmailfromd-7929af051a38ff8c79edc8166c2dc6256053c461.tar.gz
mailfromd-7929af051a38ff8c79edc8166c2dc6256053c461.tar.bz2
Relicense under the GPLv3
git-svn-id: file:///svnroot/mailfromd/trunk@1495 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'src/main.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/main.c38
1 files changed, 2 insertions, 36 deletions
diff --git a/src/main.c b/src/main.c
index cd3e7e1..559939a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,7 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
@@ -40,7 +40,6 @@
#include <mailutils/argp.h>
#include "mailfromd.h"
-#include <version-etc.h>
/* Configurable options */
@@ -124,9 +123,7 @@ time_t response_timeout = 30;
int
syslog_printer (int prio, const char *fmt, va_list ap)
{
-#ifdef USE_SYSLOG_ASYNC
- vsyslog_async (prio, fmt, ap);
-#elif HAVE_VSYSLOG
+#if HAVE_VSYSLOG
vsyslog (prio, fmt, ap);
#else
char buf[128];
@@ -136,32 +133,6 @@ syslog_printer (int prio, const char *fmt, va_list ap)
return 0;
}
-#ifdef USE_SYSLOG_ASYNC
-void
-mf_gacopyz_syslog_async_log_printer(int level, char *fmt, va_list ap)
-{
- switch (level) {
- case SMI_LOG_DEBUG:
- level = LOG_DEBUG;
- break;
- case SMI_LOG_INFO:
- level = LOG_INFO;
- break;
- case SMI_LOG_WARN:
- level = LOG_WARNING;
- break;
- case SMI_LOG_ERR:
- level = LOG_ERR;
- break;
-
- case SMI_LOG_FATAL:
- default:
- level = LOG_EMERG;
- }
- vsyslog_async(level, fmt, ap);
-}
-#endif
-
int
syslog_error_printer (const char *fmt, va_list ap)
{
@@ -1708,12 +1679,7 @@ log_setup(int want_stderr)
{
/* Set up logging */
if (!want_stderr) {
-#ifdef USE_SYSLOG_ASYNC
- openlog_async(syslog_tag, LOG_PID, log_facility);
- gacopyz_set_logger (mf_gacopyz_syslog_async_log_printer);
-#else
openlog(syslog_tag, LOG_PID, log_facility);
-#endif
mu_error_set_print(syslog_error_printer);
} else {
gacopyz_set_logger(gacopyz_stderr_log_printer);

Return to:

Send suggestions and report system problems to the System administrator.