lib-smtp: smtp-server-command - Add hook for the submission of individual replies.

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 2478c05a590ece14fc8b0505f18e7fef69712ccf..a1009e8a0a9c01d7ae2f3164fc4ea72e97230610 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -471,13 +471,19 @@ smtp_server_command_replied(struct smtp_server_command **_cmd)
 {
        struct smtp_server_command *cmd = *_cmd;
 
-       if (cmd->replies_submitted < cmd->replies_expected)
-               return TRUE;
+       if (cmd->replies_submitted < cmd->replies_expected) {
+               e_debug(cmd->context.event, "Replied (one)");
+
+               return smtp_server_command_call_hooks(
+                       _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED_ONE, FALSE);
+       }
 
        e_debug(cmd->context.event, "Replied");
 
-       return smtp_server_command_call_hooks(
-               _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED, TRUE);
+       return (smtp_server_command_call_hooks(
+                       _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED_ONE, TRUE) &&
+               smtp_server_command_call_hooks(
+                       _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED, TRUE));
 }
 
 bool smtp_server_command_completed(struct smtp_server_command **_cmd)

diff --git a/src/lib-smtp/smtp-server.h b/src/lib-smtp/smtp-server.h
index 432eabfa783a0585ac0bcb012bf4a56cfdb6e27f..0cbc5d4b535d7550e19a7b6f728d34883c2c6f60 100644 (file)
--- a/src/lib-smtp/smtp-server.h
+++ b/src/lib-smtp/smtp-server.h
@@ -490,6 +490,8 @@ enum smtp_server_command_hook_type {
        /* next: command is next to reply but has not submittted all replies
           yet. */
        SMTP_SERVER_COMMAND_HOOK_NEXT,
+       /* replied_one: command has submitted one reply. */
+       SMTP_SERVER_COMMAND_HOOK_REPLIED_ONE,
        /* replied: command has submitted all replies. */
        SMTP_SERVER_COMMAND_HOOK_REPLIED,
        /* completed: server is about to send last replies for this command. */