fix

--HG--
branch : HEAD

diff --git a/src/master/login-process.c b/src/master/login-process.c
index 7b26296cbe72acb3368883f7e8f416ae129dc076..8bba7fe2e409afba822f4e604267ba086d46393f 100644 (file)
--- a/src/master/login-process.c
+++ b/src/master/login-process.c
@@ -89,7 +89,7 @@ static void login_group_create(struct login_settings *login_set)
                group->process_type = PROCESS_TYPE_IMAP;
                group->listen_fd = &mail_fd[FD_IMAP];
                group->ssl_listen_fd = &mail_fd[FD_IMAPS];
-               group->module_dir = set->imap_use_modules ? NULL :
+               group->module_dir = !set->imap_use_modules ? NULL :
                         set->imap_modules;
        } else if (strcmp(login_set->name, "pop3") == 0) {
                group->executable = set->pop3_executable;
@@ -97,7 +97,7 @@ static void login_group_create(struct login_settings *login_set)
                group->process_type = PROCESS_TYPE_POP3;
                group->listen_fd = &mail_fd[FD_POP3];
                group->ssl_listen_fd = &mail_fd[FD_POP3S];
-               group->module_dir = set->pop3_use_modules ? NULL :
+               group->module_dir = !set->pop3_use_modules ? NULL :
                         set->pop3_modules;
        } else
                i_panic("Unknown login group name '%s'", login_set->name);

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 5e7cc51ac5dc3e4fe588cd5c92c9ff4f7c55dbe3..f4a0f193f2d598ab8bba1b24ff21a8b2f3f0a462 100644 (file)
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -200,7 +200,8 @@ int create_mail_process(int socket, struct ip_addr *ip,
        if (set->mbox_read_dotlock)
                env_put("MBOX_READ_DOTLOCK=1");
 
-       env_put(t_strconcat("MODULE_DIR=", module_dir, NULL));
+       if (module_dir != NULL && *module_dir != '\0')
+               env_put(t_strconcat("MODULE_DIR=", module_dir, NULL));
 
        /* user given environment - may be malicious. virtual_user comes from
           auth process, but don't trust that too much either. Some auth