diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/bi_dns.m4 | 2 | ||||
-rw-r--r-- | src/engine.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/bi_dns.m4 b/src/bi_dns.m4 index a2639a2b..96f9d36e 100644 --- a/src/bi_dns.m4 +++ b/src/bi_dns.m4 @@ -84,7 +84,7 @@ MF_DEFUN(getmx, STRING, STRING domain, OPTIONAL, NUMBER resolve) MF_BEGIN_TEMP_SPACE(s, size); - for (i = 0, ns = 0, p = s; mxbuf[i]; i++) { + for (i = 0, ns = 0, p = s; i < MAXMXCOUNT && mxbuf[i]; i++) { size_t len = strlen(mxbuf[i]); if (ns + len + 1 > size) break; diff --git a/src/engine.c b/src/engine.c index 5548dd87..c9c5d0da 100644 --- a/src/engine.c +++ b/src/engine.c @@ -1256,6 +1256,8 @@ mailfromd_daemon() { int rc; + mu_error("mailfromd version %s starting", PACKAGE_VERSION); + priv_setup(); if (!foreground) @@ -1286,14 +1288,13 @@ mailfromd_daemon() umask(0117); mu_daemon_create_pidfile(pidfile); rc = smfi_main(); - mu_error("OK. REMOVING PIDFILE"); - mu_daemon_remove_pidfile(); } else { umask(0117); rc = smfi_main(); mu_error("smfi_main failed: rc=%d errno=%s", rc, strerror (errno)); } + mu_error("mailfromd terminating"); exit(rc); } |