dovecot-1.2: deliver: Crashfix when sending rejection mail with ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/7798e254ff67
changeset: 9557:7798e254ff67
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 05 01:36:02 2010 +0300
description:
deliver: Crashfix when sending rejection mail with Auto-Submitted: header.

diffstat:

 src/deliver/mail-send.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r a39372cd040c -r 7798e254ff67 src/deliver/mail-send.c
--- 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",