dovecot-1.2: master: Fixes to core dump log message writing.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Mar 13 21:21:56 EET 2009
details: http://hg.dovecot.org/dovecot-1.2/rev/fa0775526cf4
changeset: 8823:fa0775526cf4
user: Timo Sirainen <tss at iki.fi>
date: Fri Mar 13 15:19:13 2009 -0400
description:
master: Fixes to core dump log message writing.
diffstat:
1 file changed, 24 insertions(+), 10 deletions(-)
src/master/child-process.c | 34 ++++++++++++++++++++++++----------
diffs (47 lines):
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 @@ log_coredump(string_t *str, enum process
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)");
-#endif
- else if (core_dumps_disabled)
- str_printfa(str, " (core dumps disabled)");
- else
+ if (!settings_root->defaults->mail_drop_priv_before_exec) {
+ str_append(str, " (core not dumped - set mail_drop_priv_before_exec=yes)");
+ return;
+ }
+#endif
str_append(str, " (core not dumped - is home dir set?)");
+ return;
+ default:
+ break;
+ }
+ str_append(str, " (core not dumped)");
#endif
}
More information about the dovecot-cvs
mailing list