From: Timo Sirainen <tss@iki.fi>
Date: Fri, 25 Apr 2014 12:57:03 +0000 (+0300)
Subject: lib-lda: mail_send_rejection() logs permanent rejections now with info level.
X-Git-Tag: 2.2.13.rc1~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78d055f9dca53bca2efe939dca5074dbc47ea2d;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: mail_send_rejection() logs permanent rejections now with info level.
There's no need to log an error when return-path is invalid.
---

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index a570e88ec9..f0b16cce0b 100644
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -58,7 +58,7 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
     struct smtp_client *smtp_client;
     struct ostream *output;
     const char *return_addr, *hdr;
-    const char *value, *msgid, *orig_msgid, *boundary;
+    const char *value, *msgid, *orig_msgid, *boundary, *error;
     string_t *str;
     int ret;
 
@@ -180,5 +180,14 @@ int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
     str_truncate(str, 0);
     str_printfa(str, "\r\n\r\n--%s--\r\n", boundary);
     o_stream_nsend(output, str_data(str), str_len(str));
-    return smtp_client_close(smtp_client);
+    if ((ret = smtp_client_deinit(smtp_client, &error)) < 0) {
+	    i_error("msgid=%s: Temporarily failed to send rejection: %s",
+		    orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+		    str_sanitize(error, 512));
+    } else if (ret == 0) {
+	    i_info("msgid=%s: Permanently failed to send rejection: %s",
+		   orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+		   str_sanitize(error, 512));
+    }
+    return ret < 0 ? -1 : 0;
 }