dovecot-2.2: lib-lda: Don't crash if postmaster_address is given...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/25dc311a5faa
changeset: 18681:25dc311a5faa
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 13 19:36:29 2015 +0300
description:
lib-lda: Don't crash if postmaster_address is given as command line parameter.

diffstat:

 src/lib-lda/lda-settings.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 1171265c3834 -r 25dc311a5faa src/lib-lda/lda-settings.c
--- a/src/lib-lda/lda-settings.c	Wed May 13 19:26:45 2015 +0300
+++ b/src/lib-lda/lda-settings.c	Wed May 13 19:36:29 2015 +0300
@@ -77,8 +77,8 @@
 
 	if (*set->hostname == '\0')
 		set->hostname = p_strdup(pool, my_hostdomain());
-	i_assert(set->postmaster_address[0] == SETTING_STRVAR_UNEXPANDED[0]);
-	if (set->postmaster_address[1] == '\0') {
+	if (set->postmaster_address[0] == SETTING_STRVAR_UNEXPANDED[0] &&
+	    set->postmaster_address[1] == '\0') {
 		/* check for valid looking fqdn in hostname */
 		if (strchr(set->hostname, '.') == NULL) {
 			*error_r = "postmaster_address setting not given";