[dovecot-cvs] dovecot/src/master mail-process.c,1.27,1.28 master-settings.c,1.22,1.23 master-settings.h,1.14,1.15

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv10641/src/master

Modified Files:
	mail-process.c master-settings.c master-settings.h 
Log Message:
index_mmap_invalidate = yes now invalidate memory maps before accessing
them. Setting this on should fix some problems with OpenBSD. It should also
make it possible to use index files over NFS as long as lock daemon is used.
It might be such a good idea however.



Index: mail-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mail-process.c	12 Jul 2003 23:43:16 -0000	1.27
+++ mail-process.c	15 Jul 2003 18:26:43 -0000	1.28
@@ -214,6 +214,8 @@
 		env_put("MAILDIR_CHECK_CONTENT_CHANGES=1");
 	if (set->mail_full_filesystem_access)
 		env_put("FULL_FILESYSTEM_ACCESS=1");
+	if (set->index_mmap_invalidate)
+		env_put("MMAP_INVALIDATE=1");
 	(void)umask(set->umask);
 
 	env_put(t_strconcat("MBOX_LOCKS=", set->mbox_locks, NULL));

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- master-settings.c	12 Jul 2003 23:43:16 -0000	1.22
+++ master-settings.c	15 Jul 2003 18:26:43 -0000	1.23
@@ -92,6 +92,7 @@
 	DEF(SET_INT, mbox_dotlock_change_timeout),
 	DEF(SET_INT, umask),
 	DEF(SET_BOOL, mail_drop_priv_before_exec),
+	DEF(SET_BOOL, index_mmap_invalidate),
 
 	DEF(SET_STR, mail_executable),
 	DEF(SET_INT, mail_process_size),
@@ -193,6 +194,11 @@
 	MEMBER(mbox_dotlock_change_timeout) 30,
 	MEMBER(umask) 0077,
 	MEMBER(mail_drop_priv_before_exec) FALSE,
+#ifdef NEED_MS_INVALIDATE
+	MEMBER(index_mmap_invalidate) TRUE,
+#else
+	MEMBER(index_mmap_invalidate) FALSE,
+#endif
 
 	MEMBER(mail_executable) PKG_LIBEXECDIR"/imap",
 	MEMBER(mail_process_size) 256,

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- master-settings.h	10 Jul 2003 03:04:07 -0000	1.14
+++ master-settings.h	15 Jul 2003 18:26:43 -0000	1.15
@@ -79,6 +79,7 @@
 	unsigned int mbox_dotlock_change_timeout;
 	unsigned int umask;
 	int mail_drop_priv_before_exec;
+	int index_mmap_invalidate;
 
 	const char *mail_executable;
 	unsigned int mail_process_size;