[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-lock.c, 1.19, 1.20

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv14180/lib-storage/index/mbox

Modified Files:
	mbox-lock.c 
Log Message:
Having "dotlock fcntl" locking assert-crashes if dotlock file already
exists.



Index: mbox-lock.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-lock.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mbox-lock.c	30 Sep 2005 18:55:01 -0000	1.19
+++ mbox-lock.c	27 Oct 2005 13:11:44 -0000	1.20
@@ -376,7 +376,8 @@
 	fl.l_len = 0;
 
 	if (max_wait_time == 0) {
-		i_assert(lock_type == F_UNLCK);
+		/* usually we're waiting here, but if we came from
+		   mbox_lock_dotlock(), we just want to try locking */
 		wait_type = F_SETLK;
 	} else {
 		wait_type = F_SETLKW;