From 13d247c5be824ca9c24e33acf076258ff2e2cac5 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 14 May 2003 21:29:53 +0300 Subject: [PATCH] fix --HG-- branch : HEAD --- src/master/login-process.c | 4 ++-- src/master/mail-process.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/master/login-process.c b/src/master/login-process.c index 7b26296cbe..8bba7fe2e4 100644 --- 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 5e7cc51ac5..f4a0f193f2 100644 --- 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 -- 2.47.3