diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-06-30 07:12:15 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-06-30 07:12:15 +0000 |
| commit | 7929af051a38ff8c79edc8166c2dc6256053c461 (patch) | |
| tree | d9f94f087326fd11ad05ea2053bef1d9ef45da08 /src | |
| parent | 184e9cca3cc12a900f2da25dc3850c6e3f7119c8 (diff) | |
| download | mailfromd-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')
53 files changed, 72 insertions, 629 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c169cf63..bf6f004b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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, @@ -62,9 +62,7 @@ mailfromd_SOURCES = \ rate.c\ $(M4_FILES:.m4=.c) -EXTRA_LIBRARIES=libsyslog_async.a -noinst_LIBRARIES=libmf.a @BUILD_SYSLOG_ASYNC@ -libsyslog_async_a_SOURCES=syslog_async.c syslog_async.h +noinst_LIBRARIES=libmf.a libmf_a_SOURCES=\ version.c @@ -98,9 +96,7 @@ EXTRA_DIST = \ optab.oph\ snarf.m4\ status.mfh\ - status.mfi\ - syslog_async.c\ - syslog_async.h + status.mfi BUILT_SOURCES=\ $(M4_FILES:.m4=.c)\ diff --git a/src/bi_db.m4 b/src/bi_db.m4 index 246f19b9..537ec8c9 100644 --- a/src/bi_db.m4 +++ b/src/bi_db.m4 @@ -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, diff --git a/src/bi_dns.m4 b/src/bi_dns.m4 index 1cec5140..e48c59a2 100644 --- a/src/bi_dns.m4 +++ b/src/bi_dns.m4 @@ -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, diff --git a/src/bi_gettext.m4 b/src/bi_gettext.m4 index 20e45d86..3450d9f1 100644 --- a/src/bi_gettext.m4 +++ b/src/bi_gettext.m4 @@ -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, diff --git a/src/bi_io.m4 b/src/bi_io.m4 index 9f5b2454..64d229d4 100644 --- a/src/bi_io.m4 +++ b/src/bi_io.m4 @@ -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, diff --git a/src/bi_ipaddr.m4 b/src/bi_ipaddr.m4 index 91c6e700..82677819 100644 --- a/src/bi_ipaddr.m4 +++ b/src/bi_ipaddr.m4 @@ -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, diff --git a/src/bi_mail.m4 b/src/bi_mail.m4 index 8cd73fb5..bb7e7888 100644 --- a/src/bi_mail.m4 +++ b/src/bi_mail.m4 @@ -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, diff --git a/src/bi_other.m4 b/src/bi_other.m4 index d3354a41..1e4a98c2 100644 --- a/src/bi_other.m4 +++ b/src/bi_other.m4 @@ -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, diff --git a/src/bi_poll.m4 b/src/bi_poll.m4 index 570afcda..9d37aaac 100644 --- a/src/bi_poll.m4 +++ b/src/bi_poll.m4 @@ -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, diff --git a/src/bi_sa.m4 b/src/bi_sa.m4 index 4dd127d7..65c8f45e 100644 --- a/src/bi_sa.m4 +++ b/src/bi_sa.m4 @@ -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, diff --git a/src/bi_spf.m4 b/src/bi_spf.m4 index a09a7bce..92be15c0 100644 --- a/src/bi_spf.m4 +++ b/src/bi_spf.m4 @@ -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, diff --git a/src/bi_sprintf.m4 b/src/bi_sprintf.m4 index f25e33c0..b8407264 100644 --- a/src/bi_sprintf.m4 +++ b/src/bi_sprintf.m4 @@ -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, diff --git a/src/bi_string.m4 b/src/bi_string.m4 index 8906d083..264503c6 100644 --- a/src/bi_string.m4 +++ b/src/bi_string.m4 @@ -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, diff --git a/src/bi_system.m4 b/src/bi_system.m4 index aa340bc3..aa3327b3 100644 --- a/src/bi_system.m4 +++ b/src/bi_system.m4 @@ -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, diff --git a/src/bi_vars.m4 b/src/bi_vars.m4 index aca795b4..df549384 100644 --- a/src/bi_vars.m4 +++ b/src/bi_vars.m4 @@ -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, diff --git a/src/cache.c b/src/cache.c index 39939ae7..10f8a9a5 100644 --- a/src/cache.c +++ b/src/cache.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, @@ -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, diff --git a/src/debug.cin b/src/debug.cin index 34f06a03..848521fc 100644 --- a/src/debug.cin +++ b/src/debug.cin @@ -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, diff --git a/src/debug.hin b/src/debug.hin index a7309f72..c60f364c 100644 --- a/src/debug.hin +++ b/src/debug.hin @@ -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, diff --git a/src/debugdef.m4 b/src/debugdef.m4 index f9c16082..c9c28127 100644 --- a/src/debugdef.m4 +++ b/src/debugdef.m4 @@ -4,7 +4,7 @@ divert(-1) # # 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, @@ -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, @@ -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, diff --git a/src/dnsbase.c b/src/dnsbase.c index 45bd6c2c..b38d012a 100644 --- a/src/dnsbase.c +++ b/src/dnsbase.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, diff --git a/src/dnscache.c b/src/dnscache.c index 7945295f..6a0aad70 100644 --- a/src/dnscache.c +++ b/src/dnscache.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, diff --git a/src/drivers.c b/src/drivers.c index b759b2bc..ea150636 100644 --- a/src/drivers.c +++ b/src/drivers.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, diff --git a/src/drv.awk b/src/drv.awk index dd697533..b54979ae 100644 --- a/src/drv.awk +++ b/src/drv.awk @@ -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, diff --git a/src/engine.c b/src/engine.c index 83859f55..3f197059 100644 --- a/src/engine.c +++ b/src/engine.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, @@ -4,7 +4,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, diff --git a/src/init.m4 b/src/init.m4 index ddc9a165..9ee9e538 100644 --- a/src/init.m4 +++ b/src/init.m4 @@ -4,7 +4,7 @@ m4_divert(-1) # # 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, @@ -4,7 +4,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, diff --git a/src/mailfromd.h b/src/mailfromd.h index ca2ee3b5..26df3732 100644 --- a/src/mailfromd.h +++ b/src/mailfromd.h @@ -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, @@ -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); diff --git a/src/mf-status.mfi b/src/mf-status.mfi index 6d8dd95f..539b04a1 100644 --- a/ |