summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2007-04-17 16:44:14 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2007-04-17 16:44:14 (GMT)
commite8689b969f84ead4f34f3b40545b0b5fab4729c5 (patch) (side-by-side diff)
tree4c2cdf6779dd76fbb3dcb676dab16e4b1c19aa41
parent2cde838634410277e59562959ed3ee9989622d0d (diff)
downloadmailfromd-release_3_1_patches.tar.gz
mailfromd-release_3_1_patches.tar.bz2
Bug fixes (sync with trunk)release_3_1_patches
git-svn-id: file:///svnroot/mailfromd/branches/release_3_1_patches@1358 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog8
-rw-r--r--src/bi_dns.m42
-rw-r--r--src/engine.c5
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b02def..1b47ade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-17 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * src/engine.c (mailfromd_daemon): Do not call
+ mu_daemon_remove_pidfile, this results in a
+ duplicate free at exit (compensate for mailutils bug)
+ Issue informational messages on program startup and shutdown.
+ * src/bi_dns.m4 (getmx): Fix iteration over mxbuf
+
2007-04-16 Sergey Poznyakoff <gray@gnu.org.ua>
* src/mu_dbm.c, src/mu_dbm.h, src/engine.c, src/main.c: Fix
diff --git a/src/bi_dns.m4 b/src/bi_dns.m4
index a2639a2..96f9d36 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 5548dd8..c9c5d0d 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);
}

Return to:

Send suggestions and report system problems to the System administrator.