From 5f5f93e9629dc3b8a505c73e8b3d9ef355c48c0b Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Fri, 18 Jun 2021 16:54:51 +0200 Subject: [PATCH] lib-smtp: smtp-server-connection - Use smtp_server_connection_get_proxy_data() for the conn_proxy_data_updated() callback. Removes code duplication. --- src/lib-smtp/smtp-server-connection.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c index c3ee939c39..741688ea86 100644 --- a/src/lib-smtp/smtp-server-connection.c +++ b/src/lib-smtp/smtp-server-connection.c @@ -1565,14 +1565,7 @@ void smtp_server_connection_set_proxy_data( conn->callbacks->conn_proxy_data_updated != NULL) { struct smtp_proxy_data full_data; - i_zero(&full_data); - full_data.source_ip = conn->conn.remote_ip; - full_data.source_port = conn->conn.remote_port; - full_data.helo = conn->helo.domain; - full_data.login = conn->username; - full_data.proto = conn->proxy_proto; - full_data.ttl_plus_1 = conn->proxy_ttl_plus_1; - full_data.timeout_secs = conn->proxy_timeout_secs; + smtp_server_connection_get_proxy_data(conn, &full_data); conn->callbacks-> conn_proxy_data_updated(conn->context, &full_data); -- 2.47.3