[dovecot-cvs] dovecot-lda/src deliver.c,1.25,1.26

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src
In directory talvi:/tmp/cvs-serv7185

Modified Files:
	deliver.c 
Log Message:
Default lock_method to flock instead of fcntl.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/deliver.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- deliver.c	30 Sep 2005 18:55:42 -0000	1.25
+++ deliver.c	3 Oct 2005 21:23:33 -0000	1.26
@@ -525,10 +525,10 @@
 		flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
 
 	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