[dovecot-cvs] dovecot/src/deliver deliver.c,1.11,1.12

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv7265/deliver

Modified Files:
	deliver.c 
Log Message:
And lock_method fixes..



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- deliver.c	3 Oct 2005 21:23:18 -0000	1.11
+++ deliver.c	3 Oct 2005 21:25:03 -0000	1.12
@@ -433,9 +433,10 @@
 	    str != NULL && var_get_key(str + 1) == 'm')
 		flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
 
+	str = getenv("LOCK_METHOD");
 	if (str == NULL || strcmp(str, "flock") == 0)
 		lock_method = MAIL_STORAGE_LOCK_FLOCK;
-	if (strcmp(str, "fcntl") == 0)
+	else if (strcmp(str, "fcntl") == 0)
 		lock_method = MAIL_STORAGE_LOCK_FCNTL;
 	else if (strcmp(str, "dotlock") == 0)
 		lock_method = MAIL_STORAGE_LOCK_DOTLOCK;