# HG changeset patch # User Timo Sirainen # Date 1236971953 14400 # Node ID fa0775526cf4d8cab40a8c480ca23ae09f99a997 # Parent 978010934c02f4a545269ac68e99694ca5dc25d5 master: Fixes to core dump log message writing. diff -r 978010934c02 -r fa0775526cf4 src/master/child-process.c --- a/src/master/child-process.c Fri Mar 13 15:12:23 2009 -0400 +++ b/src/master/child-process.c Fri Mar 13 15:19:13 2009 -0400 @@ -142,19 +142,33 @@ return; /* let's try to figure out why we didn't get a core dump */ - if (process_type == PROCESS_TYPE_LOGIN) + if (core_dumps_disabled) { + str_printfa(str, " (core dumps disabled)"); + return; + } + + switch (process_type) { + case PROCESS_TYPE_LOGIN: +#ifdef HAVE_PR_SET_DUMPABLE str_append(str, " (core not dumped - add -D to login_executable)"); - else if (process_type != PROCESS_TYPE_IMAP && - process_type != PROCESS_TYPE_POP3) - str_append(str, " (core not dumped)"); + return; +#else + break; +#endif + case PROCESS_TYPE_IMAP: + case PROCESS_TYPE_POP3: #ifndef HAVE_PR_SET_DUMPABLE - else if (!settings_root->defaults->mail_drop_priv_before_exec) - str_append(str, " (core not dumped - set mail_drop_priv_before_exec=yes)"); + if (!settings_root->defaults->mail_drop_priv_before_exec) { + str_append(str, " (core not dumped - set mail_drop_priv_before_exec=yes)"); + return; + } #endif - else if (core_dumps_disabled) - str_printfa(str, " (core dumps disabled)"); - else str_append(str, " (core not dumped - is home dir set?)"); + return; + default: + break; + } + str_append(str, " (core not dumped)"); #endif }