From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 21 Nov 2019 13:15:44 +0000 (+0200)
Subject: lib-storage: Remove local/remote_ip/port from mail_storage_service_user event
X-Git-Tag: 2.3.10~266
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a25ca018421dbe3d8a53f078cf82bad49e8266d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove local/remote_ip/port from mail_storage_service_user event

These make sense more in the parent event.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 41648a7e4a..a2193e4a82 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1337,22 +1337,6 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
 		{ .key = "session", .value = user->input.session_id },
 		{ .key = NULL }
 	});
-	if (user->input.local_ip.family != 0) {
-		event_add_str(user->event, "local_ip",
-			      net_ip2addr(&user->input.local_ip));
-	}
-	if (user->input.local_port != 0) {
-		event_add_int(user->event, "local_port",
-			      user->input.local_port);
-	}
-	if (user->input.remote_ip.family != 0) {
-		event_add_str(user->event, "remote_ip",
-			      net_ip2addr(&user->input.remote_ip));
-	}
-	if (user->input.remote_port != 0) {
-		event_add_int(user->event, "remote_port",
-			      user->input.remote_port);
-	}
 
 	if ((flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0)
 		(void)settings_parse_line(user->set_parser, "mail_debug=yes");
diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 79609636ac..15f7b1cb0c 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -266,12 +266,6 @@ void mail_user_set_vars(struct mail_user *user, const char *service,
 	event_add_str(user->event, "service", service);
 
 	mail_user_connection_init_from(&user->conn, user->pool, conn);
-	if (user->conn.local_ip != NULL)
-		event_add_str(user->event, "local_ip",
-			      net_ip2addr(user->conn.local_ip));
-	if (user->conn.remote_ip != NULL)
-		event_add_str(user->event, "remote_ip",
-			      net_ip2addr(user->conn.remote_ip));
 }
 
 const struct var_expand_table *