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) (unidiff)
tree4c2cdf6779dd76fbb3dcb676dab16e4b1c19aa41
parent2cde838634410277e59562959ed3ee9989622d0d (diff)
downloadmailfromd-e8689b969f84ead4f34f3b40545b0b5fab4729c5.tar.gz
mailfromd-e8689b969f84ead4f34f3b40545b0b5fab4729c5.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 @@
12007-04-17 Sergey Poznyakoff <gray@gnu.org.ua>
2
3 * src/engine.c (mailfromd_daemon): Do not call
4 mu_daemon_remove_pidfile, this results in a
5 duplicate free at exit (compensate for mailutils bug)
6 Issue informational messages on program startup and shutdown.
7 * src/bi_dns.m4 (getmx): Fix iteration over mxbuf
8
12007-04-16 Sergey Poznyakoff <gray@gnu.org.ua> 92007-04-16 Sergey Poznyakoff <gray@gnu.org.ua>
2 10
3 * src/mu_dbm.c, src/mu_dbm.h, src/engine.c, src/main.c: Fix 11 * 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)
84 84
85 MF_BEGIN_TEMP_SPACE(s, size); 85 MF_BEGIN_TEMP_SPACE(s, size);
86 86
87 for (i = 0, ns = 0, p = s; mxbuf[i]; i++) { 87 for (i = 0, ns = 0, p = s; i < MAXMXCOUNT && mxbuf[i]; i++) {
88 size_t len = strlen(mxbuf[i]); 88 size_t len = strlen(mxbuf[i]);
89 if (ns + len + 1 > size) 89 if (ns + len + 1 > size)
90 break; 90 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()
1256{ 1256{
1257 int rc; 1257 int rc;
1258 1258
1259 mu_error("mailfromd version %s starting", PACKAGE_VERSION);
1260
1259 priv_setup(); 1261 priv_setup();
1260 1262
1261 if (!foreground) 1263 if (!foreground)
@@ -1286,14 +1288,13 @@ mailfromd_daemon()
1286 umask(0117); 1288 umask(0117);
1287 mu_daemon_create_pidfile(pidfile); 1289 mu_daemon_create_pidfile(pidfile);
1288 rc = smfi_main(); 1290 rc = smfi_main();
1289 mu_error("OK. REMOVING PIDFILE");
1290 mu_daemon_remove_pidfile();
1291 } else { 1291 } else {
1292 umask(0117); 1292 umask(0117);
1293 rc = smfi_main(); 1293 rc = smfi_main();
1294 mu_error("smfi_main failed: rc=%d errno=%s", 1294 mu_error("smfi_main failed: rc=%d errno=%s",
1295 rc, strerror (errno)); 1295 rc, strerror (errno));
1296 } 1296 }
1297 mu_error("mailfromd terminating");
1297 exit(rc); 1298 exit(rc);
1298} 1299}
1299 1300

Return to:

Send suggestions and report system problems to the System administrator.