From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 27 Feb 2019 20:12:20 +0000 (+0100)
Subject: lib-smtp: smtp-server-connection - Use connection->label instead of connection->name.
X-Git-Tag: 2.3.9~735
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be917a9dbae28df250c68d225c5a027232d9e8a;p=thirdparty%2Fdovecot%2Fcore.git

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 71982b6ef8..7429c55253 100644
--- 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 746c29f619..05ae0dcd05 100644
--- 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(