From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Apr 2010 22:35:31 +0000 (+0300)
Subject: lib-lda: Crashfix when sending rejection mail with Auto-Submitted: header.
X-Git-Tag: 2.0.beta5~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=446a1535e5c006d72bd67352f556862bde69e4eb;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: Crashfix when sending rejection mail with Auto-Submitted: header.

--HG--
branch : HEAD
---

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index 2002f280ed..324a263fcb 100644
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -64,6 +64,9 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
     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",
@@ -72,8 +75,6 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
 	    return 0;
     }
 
-    if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
-	    orig_msgid = NULL;
     return_addr = mail_deliver_get_return_address(ctx);
     if (return_addr == NULL) {
 	    i_info("msgid=%s: Return-Path missing, rejection reason: %s",