diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | src/bi_dns.m4 | 2 | ||||
-rw-r--r-- | src/engine.c | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,11 @@ | |||
1 | 2007-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 | |||
1 | 2007-04-16 Sergey Poznyakoff <gray@gnu.org.ua> | 9 | 2007-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 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) | |||
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 5548dd87..c9c5d0da 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 | ||