diff options
Diffstat (limited to 'mail/dbmail-devel/files/patch-2.0.7_006_281')
| -rw-r--r-- | mail/dbmail-devel/files/patch-2.0.7_006_281 | 49 |
1 files changed, 45 insertions, 4 deletions
diff --git a/mail/dbmail-devel/files/patch-2.0.7_006_281 b/mail/dbmail-devel/files/patch-2.0.7_006_281 index fd43d4942536..40e64bebc054 100644 --- a/mail/dbmail-devel/files/patch-2.0.7_006_281 +++ b/mail/dbmail-devel/files/patch-2.0.7_006_281 @@ -1,11 +1,52 @@ ---- main.c.orig Mon Nov 7 17:22:39 2005 -+++ main.c Mon Nov 7 17:22:56 2005 -@@ -419,7 +419,7 @@ +--- main.c (revision 1905) ++++ main.c (revision 1948) +@@ -388,8 +388,8 @@ + + /* parse the list and scan for field and content */ + if (mime_readheader(header, &dummyidx, &mimelist, &dummysize) < 0) { +- trace(TRACE_ERROR, +- "main(): mime_readheader failed to read a header list"); ++ trace(TRACE_ERROR, "%s,%s: mime_readheader failed", ++ __FILE__, __func__); + exitcode = EX_TEMPFAIL; + goto freeall; + } +@@ -400,15 +400,16 @@ + if (returnpath.total_nodes == 0) + mail_adr_list("From", &returnpath, &mimelist); + if (returnpath.total_nodes == 0) +- trace(TRACE_DEBUG, "main(): no return path found."); ++ trace(TRACE_DEBUG, "%s,%s: no return path found.", ++ __FILE__,__func__); + + /* If the NORMAL delivery mode has been selected... */ + if (deliver_to_header != NULL) { + /* parse for destination addresses */ + trace(TRACE_DEBUG, "main(): scanning for [%s]", deliver_to_header); + if (mail_adr_list(deliver_to_header, &users, &mimelist) != 0) { +- trace(TRACE_STOP, "main(): scanner found no email addresses (scanned for %s)", +- deliver_to_header); ++ trace(TRACE_STOP, "%s,%s: no email addresses found (scanned for %s)", ++ __FILE__,__func__, deliver_to_header); + exitcode = EX_NOUSER; + goto freeall; + } +@@ -419,11 +420,16 @@ if (! (strlen((char *)tmp->data) > 0)) continue; - deliver_to_user_t dsnuser; -+ //deliver_to_user_t dsnuser; dsnuser_init(&dsnuser); dsnuser.address = dm_strdup((char *) tmp->data); +- list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t)); ++ if (! list_nodeadd(&dsnusers, &dsnuser, sizeof(deliver_to_user_t))) { ++ trace(TRACE_ERROR,"%s,%s: out of memory in list_nodeadd", ++ __FILE__, __func__); ++ exitcode = EX_TEMPFAIL; ++ goto freeall; ++ } ++ + } + } + |