From: Timo Sirainen Date: Sat, 7 Jan 2023 20:57:29 +0000 (+0200) Subject: lib-storage: mail_storage_service_user - Add missing %{hostname} X-Git-Tag: 2.4.0~2312 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323f2cdc059522d882acb18d344f90f4829e95f4;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: mail_storage_service_user - Add missing %{hostname} This existed for mail_user already. --- diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 6202bee92f..5f339946a0 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -417,7 +417,8 @@ get_var_expand_table(struct master_service *service, const char *service_name = input->service != NULL ? input->service : service->name; - + const char *hostname = user != NULL ? + user->user_set->hostname : my_hostname; const struct var_expand_table stack_tab[] = { { 'u', input->username, "user" }, { 'n', username, "username" }, @@ -432,6 +433,7 @@ get_var_expand_table(struct master_service *service, { '\0', auth_user, "auth_user" }, { '\0', auth_username, "auth_username" }, { '\0', auth_domain, "auth_domain" }, + { '\0', hostname, "hostname" }, /* aliases: */ { '\0', net_ip2addr(&input->local_ip), "local_ip" }, { '\0', net_ip2addr(&input->remote_ip), "remote_ip" },