lib-smtp: smtp-server-command - Make removal of hook optional for smtp_server_command...

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 79fbe12631a57bedad8b31ed19e6217b00620a7b..7ad40fbc388967a130722224dd9de810104c21e0 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -295,7 +295,7 @@ bool smtp_server_command_unref(struct smtp_server_command **_cmd)
 
        /* execute hooks */
        if (!smtp_server_command_call_hooks(
-               &cmd, SMTP_SERVER_COMMAND_HOOK_DESTROY))
+               &cmd, SMTP_SERVER_COMMAND_HOOK_DESTROY, TRUE))
                i_unreached();
 
        smtp_server_reply_free(cmd);
@@ -383,7 +383,8 @@ void smtp_server_command_remove_hook(struct smtp_server_command *cmd,
 }
 
 bool smtp_server_command_call_hooks(struct smtp_server_command **_cmd,
-                                   enum smtp_server_command_hook_type type)
+                                   enum smtp_server_command_hook_type type,
+                                   bool remove)
 {
        struct smtp_server_command *cmd = *_cmd;
        struct smtp_server_command_hook *hook;
@@ -396,8 +397,10 @@ bool smtp_server_command_call_hooks(struct smtp_server_command **_cmd,
                struct smtp_server_command_hook *hook_next = hook->next;
 
                if (hook->type == type) {
-                       DLLIST2_REMOVE(&cmd->hooks_head, &cmd->hooks_tail,
-                                      hook);
+                       if (remove) {
+                               DLLIST2_REMOVE(&cmd->hooks_head,
+                                              &cmd->hooks_tail, hook);
+                       }
                        hook->func(&cmd->context, hook->context);
                }
 
@@ -460,7 +463,7 @@ bool smtp_server_command_next_to_reply(struct smtp_server_command **_cmd)
        e_debug(cmd->context.event, "Next to reply");
 
        return smtp_server_command_call_hooks(
-               _cmd, SMTP_SERVER_COMMAND_HOOK_NEXT);
+               _cmd, SMTP_SERVER_COMMAND_HOOK_NEXT, TRUE);
 }
 
 static bool
@@ -474,7 +477,7 @@ smtp_server_command_replied(struct smtp_server_command **_cmd)
        e_debug(cmd->context.event, "Replied");
 
        return smtp_server_command_call_hooks(
-               _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED);
+               _cmd, SMTP_SERVER_COMMAND_HOOK_REPLIED, TRUE);
 }
 
 bool smtp_server_command_completed(struct smtp_server_command **_cmd)
@@ -487,7 +490,7 @@ bool smtp_server_command_completed(struct smtp_server_command **_cmd)
        e_debug(cmd->context.event, "Completed");
 
        return smtp_server_command_call_hooks(
-               _cmd, SMTP_SERVER_COMMAND_HOOK_COMPLETED);
+               _cmd, SMTP_SERVER_COMMAND_HOOK_COMPLETED, TRUE);
 }
 
 static bool

diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h
index 9748b0042ba4aee5fadb2b1485c4a036d3e57e27..18721ca1168ef635c1c55b066e819d2ae4705a53 100644 (file)
--- a/src/lib-smtp/smtp-server-private.h
+++ b/src/lib-smtp/smtp-server-private.h
@@ -248,7 +248,8 @@ bool smtp_server_command_unref(struct smtp_server_command **_cmd);
 void smtp_server_command_abort(struct smtp_server_command **_cmd);
 
 bool smtp_server_command_call_hooks(struct smtp_server_command **_cmd,
-                                   enum smtp_server_command_hook_type type);
+                                   enum smtp_server_command_hook_type type,
+                                   bool remove);
 void smtp_server_command_remove_hooks(struct smtp_server_command *cmd,
                                      enum smtp_server_command_hook_type type);