← Back to branch summary

~ubuntu-branches/ubuntu/wily/dovecot/wily

« back to all changes in this revision

Viewing changes to src/lib-lda/lda-settings.c

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2015-05-24 15:01:19 UTC
  • mto: (4.1.53 sid)
  • mto: This revision was merged to the branch mainline in revision 102.
  • Revision ID: package-import@ubuntu.com-20150524150119-hsh6cbr1fqseapga
Tags: upstream-2.2.18
Import upstream version 2.2.18

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-lda/lda-settings.c
77
77
 
78
78
        if (*set->hostname == '\0')
79
79
                set->hostname = p_strdup(pool, my_hostdomain());
80
 
        i_assert(set->postmaster_address[0] == SETTING_STRVAR_UNEXPANDED[0]);
81
 
        if (set->postmaster_address[1] == '\0') {
 
80
        if (set->postmaster_address[0] == SETTING_STRVAR_UNEXPANDED[0] &&
 
81
            set->postmaster_address[1] == '\0') {
82
82
                /* check for valid looking fqdn in hostname */
83
83
                if (strchr(set->hostname, '.') == NULL) {
84
84
                        *error_r = "postmaster_address setting not given";