From: Timo Sirainen <tss@iki.fi>
Date: Tue, 13 Aug 2013 17:58:56 +0000 (+0300)
Subject: lib-lda: Default postmaster_address wasn't being set.
X-Git-Tag: 2.2.6~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4612f64419423cd0699a2a2fe104f0c6be3afcf9;p=thirdparty%2Fdovecot%2Fcore.git

lib-lda: Default postmaster_address wasn't being set.
This broke after it was set to allow %variables.
---

diff --git a/src/lib-lda/lda-settings.c b/src/lib-lda/lda-settings.c
index 9deecde8f7..981715de97 100644
--- a/src/lib-lda/lda-settings.c
+++ b/src/lib-lda/lda-settings.c
@@ -77,14 +77,16 @@ static bool lda_settings_check(void *_set, pool_t pool, const char **error_r)
 
 	if (*set->hostname == '\0')
 		set->hostname = p_strdup(pool, my_hostdomain());
-	if (*set->postmaster_address == '\0') {
+	i_assert(set->postmaster_address[0] == SETTING_STRVAR_UNEXPANDED[0]);
+	if (set->postmaster_address[1] == '\0') {
 		/* check for valid looking fqdn in hostname */
 		if (strchr(set->hostname, '.') == NULL) {
 			*error_r = "postmaster_address setting not given";
 			return FALSE;
 		}
-		set->postmaster_address = p_strconcat(pool, "postmaster@",
-						      set->hostname, NULL);
+		set->postmaster_address =
+			p_strconcat(pool, SETTING_STRVAR_UNEXPANDED,
+				    "postmaster@", set->hostname, NULL);
 	}
 	return TRUE;
 }