lmtp, lmtp client: More fixes to handling failures.

--HG--
branch : HEAD

diff --git a/src/lib-lda/lmtp-client.c b/src/lib-lda/lmtp-client.c
index b01e291bcfa3719b8160951e450e516d143926bd..673d2251a242b4ae209a759cf2b5558dd891f545 100644 (file)
--- a/src/lib-lda/lmtp-client.c
+++ b/src/lib-lda/lmtp-client.c
@@ -57,6 +57,7 @@ struct lmtp_client {
        unsigned char output_last;
 
        unsigned int output_finished:1;
+       unsigned int rcpt_to_successes:1;
 };
 
 static void lmtp_client_send_rcpts(struct lmtp_client *client);
@@ -146,22 +147,35 @@ static void lmtp_client_fail(struct lmtp_client *client, const char *line)
        lmtp_client_close(client);
 }
 
-static bool
+static void
 lmtp_client_rcpt_next(struct lmtp_client *client, const char *line)
 {
        struct lmtp_rcpt *rcpt;
-       bool success, all_sent;
+       bool success;
 
        success = line[0] == '2';
+       if (success)
+               client->rcpt_to_successes = TRUE;
 
        rcpt = array_idx_modifiable(&client->recipients,
                                    client->rcpt_next_receive_idx);
+       client->rcpt_next_receive_idx++;
+
        rcpt->failed = !success;
        rcpt->rcpt_to_callback(success, line, rcpt->context);
+}
 
-       all_sent = ++client->rcpt_next_receive_idx ==
-               array_count(&client->recipients);
-       return all_sent && client->data_input != NULL;
+static void lmtp_client_send_data_cmd(struct lmtp_client *client)
+{
+       if (client->rcpt_next_receive_idx < array_count(&client->recipients))
+               return;
+
+       if (client->global_fail_string != NULL || !client->rcpt_to_successes)
+               lmtp_client_fail(client, client->global_fail_string);
+       else {
+               client->input_state++;
+               o_stream_send_str(client->output, "DATA\r\n");
+       }
 }
 
 static bool
@@ -331,10 +345,10 @@ static int lmtp_client_input_line(struct lmtp_client *client, const char *line)
                lmtp_client_send_rcpts(client);
                break;
        case LMTP_INPUT_STATE_RCPT_TO:
-               if (!lmtp_client_rcpt_next(client, line))
+               lmtp_client_rcpt_next(client, line);
+               if (client->data_input == NULL)
                        break;
-               client->input_state++;
-               o_stream_send_str(client->output, "DATA\r\n");
+               lmtp_client_send_data_cmd(client);
                break;
        case LMTP_INPUT_STATE_DATA_CONTINUE:
                /* Start sending DATA */
@@ -470,17 +484,10 @@ void lmtp_client_add_rcpt(struct lmtp_client *client, const char *address,
 
 void lmtp_client_send(struct lmtp_client *client, struct istream *data_input)
 {
-       unsigned int rcpt_count = array_count(&client->recipients);
-
        i_stream_ref(data_input);
        client->data_input = data_input;
 
-       if (client->global_fail_string != NULL) {
-               lmtp_client_fail(client, client->global_fail_string);
-       } else if (client->rcpt_next_receive_idx == rcpt_count) {
-               client->input_state++;
-               o_stream_send_str(client->output, "DATA\r\n");
-       }
+       lmtp_client_send_data_cmd(client);
 }
 
 void lmtp_client_send_more(struct lmtp_client *client)

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index ab077f08096cc37ca13e99c6246bf160c0862966..2a5750b1ce3e5dea3e4783065ab9aeba31cc1375 100644 (file)
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -346,6 +346,8 @@ static bool lmtp_proxy_data_read(struct lmtp_proxy *proxy)
                        /* finished reading data input. now we'll just have to
                           wait for replies. */
                        lmtp_proxy_wait_for_output(proxy);
+                       /* if all RCPT TOs failed, we can finish now */
+                       lmtp_proxy_try_finish(proxy);
                }
                return FALSE;
        case 0: