[dovecot-cvs] dovecot/src/imap namespace.c,1.8,1.9

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv7036/src/imap

Modified Files:
	namespace.c 
Log Message:
Default lock_method to flock instead of fcntl. This is at least useful for
not allowing Dovecot's indexes to be used accidentally with wrong settings
in NFS mounted partitions.



Index: namespace.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/namespace.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- namespace.c	3 Apr 2005 11:36:14 -0000	1.8
+++ namespace.c	3 Oct 2005 21:23:23 -0000	1.9
@@ -105,10 +105,10 @@
 		flags |= MAIL_STORAGE_FLAG_SAVE_CRLF;
 
 	str = getenv("LOCK_METHOD");
-	if (str == NULL || strcmp(str, "fcntl") == 0)
-		lock_method = MAIL_STORAGE_LOCK_FCNTL;
-	else if (strcmp(str, "flock") == 0)
+	if (str == NULL || strcmp(str, "flock") == 0)
 		lock_method = MAIL_STORAGE_LOCK_FLOCK;
+	if (strcmp(str, "fcntl") == 0)
+		lock_method = MAIL_STORAGE_LOCK_FCNTL;
 	else if (strcmp(str, "dotlock") == 0)
 		lock_method = MAIL_STORAGE_LOCK_DOTLOCK;
 	else