summaryrefslogtreecommitdiffabout
path: root/src/main.c
authorSergey Poznyakoff <gray@gnu.org.ua>2008-01-15 13:44:11 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2008-01-15 13:44:11 (GMT)
commit1e1e0552e60b1ebbcefeb6f90335643fc5f3d1b5 (patch) (side-by-side diff)
tree17b8970a68d2e0dbbf27087ea40e8a3f7fc65ff0 /src/main.c
parentfa13b14de5288220b8d02a331b6fa6d54269f38a (diff)
downloadmailfromd-1e1e0552e60b1ebbcefeb6f90335643fc5f3d1b5.tar.gz
mailfromd-1e1e0552e60b1ebbcefeb6f90335643fc5f3d1b5.tar.bz2
Ported r1556 from branches/gmach.
* src/gram.y (DELETE string): Initialize hdr.value. * src/drivers.c (code_type_header): Value can be NULL. Fix compatibility with MU CVS: * src/main.c: Use mu_log_facility. * src/mtasim.c [MAILUTILS_VERSION_NUMBER > 1290]: Include gettext.h, define _ and N_. * configure.ac: Check for mu_log_facility. git-svn-id: file:///svnroot/mailfromd/trunk@1569 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'src/main.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 23df6e5..4741dba 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,9 @@
#else
# include <mailutils/libargp.h>
#endif
+#ifdef HAVE_MAILUTILS_SYSLOG_H
+# include <mailutils/syslog.h>
+#endif
#include "mailfromd.h"
@@ -2056,12 +2059,12 @@ log_setup(int want_stderr)
if (!want_stderr) {
#ifdef USE_SYSLOG_ASYNC
if (use_syslog_async) {
- openlog_async(syslog_tag, LOG_PID, log_facility);
+ openlog_async(syslog_tag, LOG_PID, mu_log_facility);
gacopyz_set_logger(mf_gacopyz_syslog_async_log_printer);
} else
#endif
{
- openlog(syslog_tag, LOG_PID, log_facility);
+ openlog(syslog_tag, LOG_PID, mu_log_facility);
gacopyz_set_logger(gacopyz_syslog_log_printer);
}
mu_error_set_print(syslog_error_printer);
@@ -2109,7 +2112,7 @@ main(int argc, char **argv)
yy_flex_debug = 0;
/* Set default logging */
- log_facility = DEFAULT_LOG_FACILITY;
+ mu_log_facility = DEFAULT_LOG_FACILITY;
log_setup(!stderr_closed_p());
init_names();

Return to:

Send suggestions and report system problems to the System administrator.