# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1236971506 14400
# Node ID 71cfd00e1375af2612b862932f7e73b561b6971f
# Parent  6131143fef1607ce9d3b339c647b8aec3f31e170
master: If login process has -D parameter, make login directory writable.

diff -r 6131143fef16 -r 71cfd00e1375 src/master/master-settings.c
--- a/src/master/master-settings.c	Fri Mar 13 14:50:41 2009 -0400
+++ b/src/master/master-settings.c	Fri Mar 13 15:11:46 2009 -0400
@@ -941,6 +941,19 @@
 	return TRUE;
 }
 
+static bool login_want_core_dumps(struct settings *set)
+{
+	const char *p;
+
+	p = strstr(set->server->pop3->login_executable, " -D");
+	if (p != NULL && p[3] == '\0')
+		return TRUE;
+	p = strstr(set->server->imap->login_executable, " -D");
+	if (p != NULL && p[3] == '\0')
+		return TRUE;
+	return FALSE;
+}
+
 static bool settings_do_fixes(struct settings *set)
 {
 	struct stat st;
@@ -972,7 +985,8 @@
 		   empty. with external auth we wouldn't want to delete
 		   existing sockets or break the permissions required by the
 		   auth server. */
-		if (safe_mkdir(set->login_dir, 0750,
+		mode_t mode = login_want_core_dumps(set) ? 0770 : 0750;
+		if (safe_mkdir(set->login_dir, mode,
 			       master_uid, set->server->login_gid) == 0) {
 			i_warning("Corrected permissions for login directory "
 				  "%s", set->login_dir);