dovecot-1.2: Code cleanup for previous change.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Nov 15 19:37:39 EET 2008
details: http://hg.dovecot.org/dovecot-1.2/rev/ed4d6fc5712b
changeset: 8406:ed4d6fc5712b
user: Timo Sirainen <tss at iki.fi>
date: Sat Nov 15 19:37:35 2008 +0200
description:
Code cleanup for previous change.
diffstat:
1 file changed, 8 insertions(+), 8 deletions(-)
src/master/mail-process.c | 16 ++++++++--------
diffs (47 lines):
diff -r cb742f826abd -r ed4d6fc5712b src/master/mail-process.c
--- a/src/master/mail-process.c Sat Nov 15 19:34:28 2008 +0200
+++ b/src/master/mail-process.c Sat Nov 15 19:37:35 2008 +0200
@@ -290,7 +290,7 @@ static void
static void
mail_process_set_environment(struct settings *set, const char *mail,
const struct var_expand_table *var_expand_table,
- bool dump_capability, bool exec_mail)
+ bool exec_mail)
{
const char *const *envs;
string_t *str;
@@ -369,11 +369,11 @@ mail_process_set_environment(struct sett
env_put("MBOX_VERY_DIRTY_SYNCS=1");
if (set->mbox_lazy_writes)
env_put("MBOX_LAZY_WRITES=1");
- /* when running dump-capability log still points to stderr,
- and io_add()ing it might break (epoll_ctl() gives EPERM).
- with --exec-mail there's no benefit in adding an extra stderr
- listener, but it might cause problems. */
- if (set->shutdown_clients && !dump_capability && !exec_mail)
+ /* when we're not certain that the log fd points to the master
+ process's log pipe (dump-capability, --exec-mail), don't let
+ the imap process listen for stderr since it might break
+ (e.g. epoll_ctl() gives EPERM). */
+ if (set->shutdown_clients && !exec_mail)
env_put("STDERR_CLOSE_SHUTDOWN=1");
(void)umask(set->umask);
@@ -488,7 +488,7 @@ void mail_process_exec(const char *proto
}
mail_process_set_environment(set, getenv("MAIL"), var_expand_table,
- FALSE, TRUE);
+ TRUE);
if (args == NULL)
client_process_exec(executable, "");
else
@@ -818,7 +818,7 @@ create_mail_process(enum process_type pr
}
mail_process_set_environment(set, mail, var_expand_table,
- dump_capability, FALSE);
+ dump_capability);
/* extra args. uppercase key value. */
args = array_get(&extra_args, &count);
More information about the dovecot-cvs
mailing list