Relicense under the GPLv3

git-svn-id: file:///svnroot/mailfromd/trunk@1495 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 2 insertions, 36 deletions

diff --git a/src/main.c b/src/main.c
index cd3e7e17..559939a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,3 +5,3 @@
    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.
@@ -42,3 +42,2 @@
 #include "mailfromd.h"
-#include <version-etc.h>
 
@@ -126,5 +125,3 @@ 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);
@@ -138,28 +135,2 @@ syslog_printer (int prio, const char *fmt, va_list ap)
 
-#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
@@ -1710,8 +1681,3 @@ log_setup(int want_stderr)
 	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);