lib-smtp: smtp-server-connection - Use connection->label instead of connection->name.

diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index 71982b6ef8215f5d35d3659fa72489517d754e73..7429c5525336e5daf53309282edbaf29a7ac7589 100644 (file)
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -788,7 +788,8 @@ void smtp_server_connection_trigger_output(
 static struct connection_settings smtp_server_connection_set = {
        .input_max_size = (size_t)-1,
        .output_max_size = (size_t)-1,
-       .client = FALSE
+       .client = FALSE,
+       .log_connection_id = TRUE,
 };
 
 static const struct connection_vfuncs smtp_server_connection_vfuncs = {

diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h
index 746c29f619a1e9bbb346e0f86066a91c75601949..05ae0dcd05f362fe333da5325b40a643d1ea4dda 100644 (file)
--- a/src/lib-smtp/smtp-server-private.h
+++ b/src/lib-smtp/smtp-server-private.h
@@ -225,7 +225,7 @@ smtp_server_command_label(struct smtp_server_command *cmd)
 static inline const char *
 smtp_server_connection_label(struct smtp_server_connection *conn)
 {
-       return conn->conn.name;
+       return conn->conn.label;
 }
 
 bool smtp_server_connection_pending_command_data(