[dovecot-cvs] dovecot/src/master mail-process.c, 1.39, 1.40 master-settings.c, 1.39, 1.40 master-settings.h, 1.23, 1.24

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv830/src/master

Modified Files:
	mail-process.c master-settings.c master-settings.h 
Log Message:
Added fcntl_lock_disable setting to allow indexes to work with NFS. Some
other locking fixes.



Index: mail-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mail-process.c	28 Apr 2004 00:21:01 -0000	1.39
+++ mail-process.c	28 Apr 2004 02:00:40 -0000	1.40
@@ -265,6 +265,8 @@
 		env_put("MMAP_DISABLE=1");
 	if (set->mmap_no_write)
 		env_put("MMAP_NO_WRITE=1");
+	if (set->fcntl_locks_disable)
+		env_put("FCNTL_LOCKS_DISABLE=1");
 	if (set->maildir_copy_with_hardlinks)
 		env_put("MAILDIR_COPY_WITH_HARDLINKS=1");
 	if (set->maildir_check_content_changes)

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- master-settings.c	28 Apr 2004 00:21:01 -0000	1.39
+++ master-settings.c	28 Apr 2004 02:00:40 -0000	1.40
@@ -90,6 +90,7 @@
 	DEF(SET_BOOL, mail_read_mmaped),
 	DEF(SET_BOOL, mmap_disable),
 	DEF(SET_BOOL, mmap_no_write),
+	DEF(SET_BOOL, fcntl_locks_disable),
 	DEF(SET_BOOL, maildir_copy_with_hardlinks),
 	DEF(SET_BOOL, maildir_check_content_changes),
 	DEF(SET_STR, mbox_locks),
@@ -214,6 +215,7 @@
 #else
 	MEMBER(mmap_no_write) FALSE,
 #endif
+	MEMBER(fcntl_locks_disable) FALSE,
 	MEMBER(maildir_copy_with_hardlinks) FALSE,
 	MEMBER(maildir_check_content_changes) FALSE,
 	MEMBER(mbox_locks) "dotlock fcntl",

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- master-settings.h	28 Apr 2004 00:21:01 -0000	1.23
+++ master-settings.h	28 Apr 2004 02:00:40 -0000	1.24
@@ -65,6 +65,7 @@
 	int mail_read_mmaped;
 	int mmap_disable;
 	int mmap_no_write;
+	int fcntl_locks_disable;
 	int maildir_copy_with_hardlinks;
 	int maildir_check_content_changes;
 	const char *mbox_locks;