[dovecot-cvs] dovecot/src/deliver deliver.c,1.39,1.40

[tss at dovecot.org]

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

Modified Files:
	deliver.c 
Log Message:
Lock handling changes. Everything goes through file-lock API now and there's
only a single enum listing the different lock methods. This change exposed
some unneeded (or possibly even wrong?) unlock calls in index file handling
which were fixed.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- deliver.c	25 Nov 2006 22:17:39 -0000	1.39
+++ deliver.c	6 Dec 2006 15:08:38 -0000	1.40
@@ -2,6 +2,7 @@
 
 #include "lib.h"
 #include "lib-signals.h"
+#include "file-lock.h"
 #include "ioloop.h"
 #include "hostpid.h"
 #include "home-expand.h"
@@ -384,7 +385,7 @@
 	const char *home, *destination, *user, *mail_env, *value;
         const struct var_expand_table *table;
         enum mail_storage_flags flags;
-        enum mail_storage_lock_method lock_method;
+        enum file_lock_method lock_method;
 	struct mail_storage *storage, *mbox_storage;
 	struct mailbox *box;
 	struct istream *input;
@@ -565,7 +566,7 @@
 	}
 
 	mbox_storage = mail_storage_create("mbox", "/tmp", destination, 0,
-					   MAIL_STORAGE_LOCK_FCNTL);
+					   FILE_LOCK_METHOD_FCNTL);
 	input = create_mbox_stream(0, envelope_sender);
 	box = mailbox_open(mbox_storage, "Dovecot Delivery Mail", input,
 			   MAILBOX_OPEN_NO_INDEX_FILES |