[dovecot-cvs] dovecot/src/master mail-process.c, 1.59, 1.60 master-settings.c, 1.71, 1.72 master-settings.h, 1.47, 1.48

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv11749/src/master

Modified Files:
	mail-process.c master-settings.c master-settings.h 
Log Message:
Replaced fcntl_locks_disable with lock_method, so it's now possible to use
flock() to lock indexes.



Index: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mail-process.c	10 Oct 2004 14:32:33 -0000	1.59
+++ mail-process.c	10 Oct 2004 17:25:45 -0000	1.60
@@ -208,8 +208,6 @@
 		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_stat_dirs)
 		env_put("MAILDIR_STAT_DIRS=1");
 	if (set->maildir_copy_with_hardlinks)
@@ -226,6 +224,7 @@
 		env_put("MBOX_LAZY_WRITES=1");
 	(void)umask(set->umask);
 
+	env_put(t_strconcat("LOCK_METHOD=", set->lock_method, NULL));
 	env_put(t_strconcat("MBOX_READ_LOCKS=", set->mbox_read_locks, NULL));
 	env_put(t_strconcat("MBOX_WRITE_LOCKS=", set->mbox_write_locks, NULL));
 	env_put(t_strdup_printf("MBOX_LOCK_TIMEOUT=%u",

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- master-settings.c	10 Oct 2004 14:32:33 -0000	1.71
+++ master-settings.c	10 Oct 2004 17:25:45 -0000	1.72
@@ -97,7 +97,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_STR, lock_method),
 	DEF(SET_BOOL, maildir_stat_dirs),
 	DEF(SET_BOOL, maildir_copy_with_hardlinks),
 	DEF(SET_BOOL, maildir_check_content_changes),
@@ -265,7 +265,7 @@
 #else
 	MEMBER(mmap_no_write) FALSE,
 #endif
-	MEMBER(fcntl_locks_disable) FALSE,
+	MEMBER(lock_method) "fcntl",
 	MEMBER(maildir_stat_dirs) FALSE,
 	MEMBER(maildir_copy_with_hardlinks) FALSE,
 	MEMBER(maildir_check_content_changes) FALSE,

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- master-settings.h	10 Oct 2004 14:32:33 -0000	1.47
+++ master-settings.h	10 Oct 2004 17:25:45 -0000	1.48
@@ -68,7 +68,7 @@
 	int mail_read_mmaped;
 	int mmap_disable;
 	int mmap_no_write;
-	int fcntl_locks_disable;
+	const char *lock_method;
 	int maildir_stat_dirs;
 	int maildir_copy_with_hardlinks;
 	int maildir_check_content_changes;