lib-lda: Fixed indentation in mail-send.c.

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index 099fb45d0a58fcfcbbb7cb87bcc98cc00db62212..76ffc12e788209cb83c2d5f143ffe466c16b10a1 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -45,147 +45,148 @@ get_var_expand_table(struct mail *mail, const char *reason,
 int mail_send_rejection(struct mail_deliver_context *ctx, const char *recipient,
                        const char *reason)
 {
-    struct mail *mail = ctx->src_mail;
-    struct istream *input;
-    struct smtp_client *smtp_client;
-    struct ostream *output;
-    const char *return_addr, *hdr;
-    const char *value, *msgid, *orig_msgid, *boundary, *error;
-    string_t *str;
-    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",
-                  orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
-                  str_sanitize(reason, 512));
-           return 0;
-    }
-
-    return_addr = mail_deliver_get_return_address(ctx);
-    if (return_addr == NULL) {
-           i_info("msgid=%s: Return-Path missing, rejection reason: %s",
-                  orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
-                  str_sanitize(reason, 512));
-           return 0;
-    }
-
-    if (mailbox_get_settings(mail->box)->mail_debug) {
-           i_debug("Sending a rejection to %s: %s", recipient,
-                   str_sanitize(reason, 512));
-    }
-
-    smtp_client = smtp_client_init(ctx->set, NULL);
-    smtp_client_add_rcpt(smtp_client, return_addr);
-    output = smtp_client_send(smtp_client);
-
-    msgid = mail_deliver_get_new_message_id(ctx);
-    boundary = t_strdup_printf("%s/%s", my_pid, ctx->set->hostname);
-
-    str = t_str_new(512);
-    str_printfa(str, "Message-ID: %s\r\n", msgid);
-    str_printfa(str, "Date: %s\r\n", message_date_create(ioloop_time));
-    str_printfa(str, "From: Mail Delivery Subsystem <%s>\r\n",
+       struct mail *mail = ctx->src_mail;
+       struct istream *input;
+       struct smtp_client *smtp_client;
+       struct ostream *output;
+       const char *return_addr, *hdr;
+       const char *value, *msgid, *orig_msgid, *boundary, *error;
+       string_t *str;
+       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",
+                       orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+                       str_sanitize(reason, 512));
+               return 0;
+       }
+
+       return_addr = mail_deliver_get_return_address(ctx);
+       if (return_addr == NULL) {
+               i_info("msgid=%s: Return-Path missing, rejection reason: %s",
+                       orig_msgid == NULL ? "" : str_sanitize(orig_msgid, 80),
+                       str_sanitize(reason, 512));
+               return 0;
+       }
+
+       if (mailbox_get_settings(mail->box)->mail_debug) {
+               i_debug("Sending a rejection to %s: %s", recipient,
+                       str_sanitize(reason, 512));
+       }
+
+       smtp_client = smtp_client_init(ctx->set, NULL);
+       smtp_client_add_rcpt(smtp_client, return_addr);
+       output = smtp_client_send(smtp_client);
+
+       msgid = mail_deliver_get_new_message_id(ctx);
+       boundary = t_strdup_printf("%s/%s", my_pid, ctx->set->hostname);
+
+       str = t_str_new(512);
+       str_printfa(str, "Message-ID: %s\r\n", msgid);
+       str_printfa(str, "Date: %s\r\n", message_date_create(ioloop_time));
+       str_printfa(str, "From: Mail Delivery Subsystem <%s>\r\n",
                ctx->set->postmaster_address);
-    str_printfa(str, "To: <%s>\r\n", return_addr);
-    str_append(str, "MIME-Version: 1.0\r\n");
-    str_printfa(str, "Content-Type: "
+       str_printfa(str, "To: <%s>\r\n", return_addr);
+       str_append(str, "MIME-Version: 1.0\r\n");
+       str_printfa(str, "Content-Type: "
                "multipart/report; report-type=%s;\r\n"
                "\tboundary=\"%s\"\r\n",
                ctx->dsn ? "delivery-status" : "disposition-notification",
                boundary);
-    str_append(str, "Subject: ");
-    if (var_expand(str, ctx->set->rejection_subject,
-                  get_var_expand_table(mail, reason, recipient), &error) <= 0) {
-           i_error("Failed to expand rejection_subject=%s: %s",
-                   ctx->set->rejection_subject, error);
-    }
-    str_append(str, "\r\n");
-
-    str_append(str, "Auto-Submitted: auto-replied (rejected)\r\n");
-    str_append(str, "Precedence: bulk\r\n");
-    str_append(str, "\r\nThis is a MIME-encapsulated message\r\n\r\n");
-
-    /* human readable status report */
-    str_printfa(str, "--%s\r\n", boundary);
-    str_append(str, "Content-Type: text/plain; charset=utf-8\r\n");
-    str_append(str, "Content-Disposition: inline\r\n");
-    str_append(str, "Content-Transfer-Encoding: 8bit\r\n\r\n");
-
-    if (var_expand(str, ctx->set->rejection_reason,
-                  get_var_expand_table(mail, reason, recipient), &error) <= 0) {
-           i_error("Failed to expand rejection_reason=%s: %s",
-                   ctx->set->rejection_reason, error);
-    }
-    str_append(str, "\r\n");
-
-    if (ctx->dsn) {
-           /* DSN status report: For LDA rejects. currently only used when
-              user is out of quota */
-           str_printfa(str, "--%s\r\n"
+       str_append(str, "Subject: ");
+       if (var_expand(str, ctx->set->rejection_subject,
+           get_var_expand_table(mail, reason, recipient), &error) <= 0) {
+               i_error("Failed to expand rejection_subject=%s: %s",
+                       ctx->set->rejection_subject, error);
+       }
+       str_append(str, "\r\n");
+
+       str_append(str, "Auto-Submitted: auto-replied (rejected)\r\n");
+       str_append(str, "Precedence: bulk\r\n");
+       str_append(str, "\r\nThis is a MIME-encapsulated message\r\n\r\n");
+
+       /* human readable status report */
+       str_printfa(str, "--%s\r\n", boundary);
+       str_append(str, "Content-Type: text/plain; charset=utf-8\r\n");
+       str_append(str, "Content-Disposition: inline\r\n");
+       str_append(str, "Content-Transfer-Encoding: 8bit\r\n\r\n");
+
+       if (var_expand(str, ctx->set->rejection_reason,
+           get_var_expand_table(mail, reason, recipient), &error) <= 0) {
+               i_error("Failed to expand rejection_reason=%s: %s",
+                       ctx->set->rejection_reason, error);
+       }
+       str_append(str, "\r\n");
+
+       if (ctx->dsn) {
+               /* DSN status report: For LDA rejects. currently only used when
+                  user is out of quota */
+               str_printfa(str, "--%s\r\n"
                        "Content-Type: message/delivery-status\r\n\r\n",
                        boundary);
-           str_printfa(str, "Reporting-MTA: dns; %s\r\n", ctx->set->hostname);
-           if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
-                   str_printfa(str, "Original-Recipient: rfc822; %s\r\n", hdr);
-           str_printfa(str, "Final-Recipient: rfc822; %s\r\n", recipient);
-           str_append(str, "Action: failed\r\n");
-           str_printfa(str, "Status: %s\r\n", ctx->mailbox_full ? "5.2.2" : "5.2.0");
-    } else {
-           /* MDN status report: For Sieve "reject" */
-           str_printfa(str, "--%s\r\n"
+               str_printfa(str, "Reporting-MTA: dns; %s\r\n", ctx->set->hostname);
+               if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
+                       str_printfa(str, "Original-Recipient: rfc822; %s\r\n", hdr);
+               str_printfa(str, "Final-Recipient: rfc822; %s\r\n", recipient);
+               str_append(str, "Action: failed\r\n");
+               str_printfa(str, "Status: %s\r\n", ctx->mailbox_full ? "5.2.2" : "5.2.0");
+       } else {
+               /* MDN status report: For Sieve "reject" */
+               str_printfa(str, "--%s\r\n"
                        "Content-Type: message/disposition-notification\r\n\r\n",
                        boundary);
-           str_printfa(str, "Reporting-UA: %s; Dovecot Mail Delivery Agent\r\n",
+               str_printfa(str, "Reporting-UA: %s; Dovecot Mail Delivery Agent\r\n",
                        ctx->set->hostname);
-           if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
-                   str_printfa(str, "Original-Recipient: rfc822; %s\r\n", hdr);
-           str_printfa(str, "Final-Recipient: rfc822; %s\r\n", recipient);
-
-           if (orig_msgid != NULL)
-                   str_printfa(str, "Original-Message-ID: %s\r\n", orig_msgid);
-           str_append(str, "Disposition: "
-                      "automatic-action/MDN-sent-automatically; deleted\r\n");
-    }
-    str_append(str, "\r\n");
-
-    /* original message's headers */
-    str_printfa(str, "--%s\r\nContent-Type: message/rfc822\r\n\r\n", boundary);
-    o_stream_nsend(output, str_data(str), str_len(str));
-
-    if (mail_get_hdr_stream(mail, NULL, &input) == 0) {
-           /* Note: If you add more headers, they need to be sorted.
-              We'll drop Content-Type because we're not including the message
-              body, and having a multipart Content-Type may confuse some
-              MIME parsers when they don't see the message boundaries. */
-           static const char *const exclude_headers[] = {
-                   "Content-Type"
-           };
-
-           input = i_stream_create_header_filter(input,
-                       HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR |
+               if (mail_get_first_header(mail, "Original-Recipient", &hdr) > 0)
+                       str_printfa(str, "Original-Recipient: rfc822; %s\r\n", hdr);
+               str_printfa(str, "Final-Recipient: rfc822; %s\r\n", recipient);
+
+               if (orig_msgid != NULL)
+                       str_printfa(str, "Original-Message-ID: %s\r\n", orig_msgid);
+               str_append(str, "Disposition: "
+                       "automatic-action/MDN-sent-automatically; deleted\r\n");
+       }
+       str_append(str, "\r\n");
+
+       /* original message's headers */
+       str_printfa(str, "--%s\r\nContent-Type: message/rfc822\r\n\r\n", boundary);
+       o_stream_nsend(output, str_data(str), str_len(str));
+
+       if (mail_get_hdr_stream(mail, NULL, &input) == 0) {
+               /* Note: If you add more headers, they need to be sorted.
+                  We'll drop Content-Type because we're not including the message
+                  body, and having a multipart Content-Type may confuse some
+                  MIME parsers when they don't see the message boundaries. */
+               static const char *const exclude_headers[] = {
+                       "Content-Type"
+               };
+
+               input = i_stream_create_header_filter(input,
+                       HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR |
                        HEADER_FILTER_HIDE_BODY, exclude_headers,
                        N_ELEMENTS(exclude_headers),
                        *null_header_filter_callback, (void *)NULL);
 
-           o_stream_nsend_istream(output, input);
-           i_stream_unref(&input);
-    }
-
-    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));
-    if ((ret = smtp_client_deinit_timeout(smtp_client, ctx->timeout_secs, &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;
+               o_stream_nsend_istream(output, input);
+               i_stream_unref(&input);
+       }
+
+       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));
+       if ((ret = smtp_client_deinit_timeout
+               (smtp_client, ctx->timeout_secs, &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;
 }