From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 10 Oct 2024 11:57:01 +0000 (+0300)
Subject: lib-storage,imap-hibernate: Drop lip, rip, lport and rport %variables
X-Git-Tag: 2.4.1~610
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=605eddf5572df36b6acc0bb514f159ddf0aef699;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage,imap-hibernate: Drop lip, rip, lport and rport %variables

They are removed in favor of local_ip, remote_ip, local_port and
remote_port.
---

diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index 999bc8ff2c..e060bfcbfd 100644
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -529,21 +529,16 @@ imap_client_get_var_expand_table(struct imap_client *client)
 		{ 'd', domain, "domain" },
 		{ 's', "imap-hibernate", "service" },
 		{ 'h', NULL /* we shouldn't need this */, "home" },
-		{ 'l', local_ip, "lip" },
-		{ 'r', remote_ip, "rip" },
-		{ 'a', local_port, "lport" },
-		{ 'a', remote_port, "rport" },
+		{ 'l', local_ip, "local_ip" },
+		{ 'r', remote_ip, "remote_ip" },
+		{ '\0', local_port, "local_port" },
+		{ '\0', remote_port, "remote_port" },
 		{ 'i', dec2str(client->state.uid), "uid" },
 		{ '\0', dec2str(client->state.gid), "gid" },
 		{ '\0', client->state.session_id, "session" },
 		{ '\0', auth_user, "auth_user" },
 		{ '\0', auth_username, "auth_username" },
 		{ '\0', auth_domain, "auth_domain" },
-		/* aliases: */
-		{ '\0', local_ip, "local_ip" },
-		{ '\0', remote_ip, "remote_ip" },
-		{ '\0', local_port, "local_port" },
-		{ '\0', remote_port, "remote_port" },
 		/* NOTE: keep this synced with lib-storage's
 		   mail_user_var_expand_table() */
 		{ '\0', NULL, NULL }
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 719b691bca..22ce5892fe 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -380,10 +380,10 @@ get_var_expand_table(struct master_service *service,
 		{ 'n', username, "username" },
 		{ 'd', domain, "domain" },
 		{ 's', service_name, "service" },
-		{ 'l', net_ip2addr(&input->local_ip), "lip" },
-		{ 'r', net_ip2addr(&input->remote_ip), "rip" },
-		{ 'a', local_port, "lport" },
-		{ 'b', remote_port, "rport" },
+		{ 'l', net_ip2addr(&input->local_ip), "local_ip" },
+		{ 'r', net_ip2addr(&input->remote_ip), "remote_ip" },
+		{ '\0', local_port, "local_port" },
+		{ '\0', remote_port," remote_port" },
 		{ '\0', input->session_id, "session" },
 		{ '\0', auth_user, "auth_user" },
 		{ '\0', auth_username, "auth_username" },
@@ -392,11 +392,6 @@ get_var_expand_table(struct master_service *service,
 		{ '\0', local_name, "local_name" },
 		{ '\0', protocol, "protocol" },
 		{ '\0', master_user, "master_user" },
-		/* aliases: */
-		{ '\0', net_ip2addr(&input->local_ip), "local_ip" },
-		{ '\0', net_ip2addr(&input->remote_ip), "remote_ip" },
-		{ '\0', local_port, "local_port" },
-		{ '\0', remote_port," remote_port" },
 		{ '\0', NULL, NULL }
 	};
 	struct var_expand_table *tab;
diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 75fc7cf3bb..4b649bfe60 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -312,10 +312,10 @@ mail_user_var_expand_table(struct mail_user *user)
 		{ 'n', username, "username" },
 		{ 'd', domain, "domain" },
 		{ 's', user->service, "service" },
-		{ 'l', local_ip, "lip" },
-		{ 'r', remote_ip, "rip" },
-		{ 'a', local_port, "lport" },
-		{ 'b', remote_port, "rport" },
+		{ 'l', local_ip, "local_ip" },
+		{ 'r', remote_ip, "remote_ip" },
+		{ '\0', local_port, "local_port" },
+		{ '\0', remote_port, "remote_port" },
 		{ '\0', user->session_id, "session" },
 		{ '\0', auth_user, "auth_user" },
 		{ '\0', auth_username, "auth_username" },
@@ -329,11 +329,6 @@ mail_user_var_expand_table(struct mail_user *user)
 		{ '\0', username, "owner_username" },
 		{ '\0', domain, "owner_domain" },
 		{ '\0', user->master_user, "master_user" },
-		/* aliases: */
-		{ '\0', local_ip, "local_ip" },
-		{ '\0', remote_ip, "remote_ip" },
-		{ '\0', local_port, "local_port" },
-		{ '\0', remote_port, "remote_port" },
 		/* NOTE: keep this synced with imap-hibernate's
 		   imap_client_var_expand_table() */
 		{ '\0', NULL, NULL }