From b2360fc58ec7aaf7d17676d75dd1039d60f9ef65 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Wed, 5 Sep 2018 21:56:42 +0200 Subject: [PATCH] lib-storage: Change default postmaster_address setting to "postmaster@". The former "postmaster@" default would only yield a valid postmaster address when there is a domain part in the username. The new default uses a conditional variable expansion choose "%d" when it is not empty and the new "%{hostname}" otherwise. --- src/lib-storage/mail-storage-settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index 3745dbe6a5..e647cb7d9c 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c @@ -326,7 +326,7 @@ static const struct mail_user_settings mail_user_default_settings = { .mail_log_prefix = "%s(%u)<%{pid}><%{session}>: ", .hostname = "", - .postmaster_address = "postmaster@%d", + .postmaster_address = "postmaster@%{if;%d;ne;;%d;%{hostname}}", .namespaces = ARRAY_INIT, .plugin_envs = ARRAY_INIT -- 2.47.3