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 41648a7e4a87131e8b03e579ca9f4889a43e4104..a2193e4a8283f7be3c84bc7f8f51625a8b0a9f0e 100644 (file)
--- 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 79609636ac583794db010ad319895ce450e0fb26..15f7b1cb0cc49dd60f015d1d6890b5183a27e3a6 100644 (file)
--- 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 *