Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9557:7798e254ff67 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deliver: Crashfix when sending rejection mail with Auto-Submitted: header.
author Timo Sirainen <tss@iki.fi>
date Mon, 05 Apr 2010 01:36:02 +0300
parents a39372cd040c
children cf3fe573a560
files src/deliver/mail-send.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/deliver/mail-send.c	Sat Mar 27 04:06:20 2010 +0200
+++ b/src/deliver/mail-send.c	Mon Apr 05 01:36:02 2010 +0300
@@ -61,6 +61,9 @@
     size_t size;
     int ret;
 
+    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
+	    orig_msgid = NULL;
+
     if (mail_get_first_header(mail, "Auto-Submitted", &value) > 0 &&
 	strcasecmp(value, "no") != 0) {
 	    i_info("msgid=%s: Auto-submitted message discarded: %s",
@@ -69,8 +72,6 @@
 	    return 0;
     }
 
-    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
-	    orig_msgid = NULL;
     return_addr = deliver_get_return_address(mail);
     if (return_addr == NULL) {
 	    i_info("msgid=%s: Return-Path missing, rejection reason: %s",