lib-smtp: smtp-server-command - Set cmd_name event field only for valid commands.

Set cmd_input_name for the user input.

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 01669c03ba338aa744ac0321141ad6e517a84c8b..dd8b0756ab25834c99bb0540d23479d8d3713000 100644 (file)
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -133,7 +133,11 @@ smtp_server_command_update_event(struct smtp_server_command *cmd)
        const char *label = (cmd->context.name == NULL ?
                            "[INVALID]" : cmd->context.name);
 
-       event_add_str(event, "cmd_name", cmd->context.name);
+       if (cmd->reg != NULL)
+               event_add_str(event, "cmd_name", cmd->reg->name);
+       else
+               event_add_str(event, "cmd_name", "unknown");
+       event_add_str(event, "cmd_input_name", cmd->context.name);
        event_set_append_log_prefix(event,
                                    t_strdup_printf("command %s: ", label));
 }