[dovecot-cvs] dovecot/src/lib-storage mail-storage.c, 1.68, 1.69 mail-storage.h, 1.123, 1.124 mailbox-list.h, 1.5, 1.6

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage
In directory talvi:/tmp/cvs-serv32328/src/lib-storage

Modified Files:
	mail-storage.c mail-storage.h mailbox-list.h 
Log Message:
Added dotlock_use_excl setting.


Index: mail-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- mail-storage.c	20 Dec 2006 19:23:44 -0000	1.68
+++ mail-storage.c	28 Dec 2006 16:28:31 -0000	1.69
@@ -76,6 +76,8 @@
 		*flags_r |= MAIL_STORAGE_FLAG_MMAP_DISABLE;
 	if (getenv("MMAP_NO_WRITE") != NULL)
 		*flags_r |= MAIL_STORAGE_FLAG_MMAP_NO_WRITE;
+	if (getenv("DOTLOCK_USE_EXCL") != NULL)
+		*flags_r |= MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL;
 	if (getenv("MAIL_READ_MMAPED") != NULL)
 		*flags_r |= MAIL_STORAGE_FLAG_MMAP_MAILS;
 	if (getenv("MAIL_SAVE_CRLF") != NULL)
@@ -380,6 +382,8 @@
 		list_flags |= MAILBOX_LIST_FLAG_INBOX;
 	if ((storage_flags & MAIL_STORAGE_FLAG_FULL_FS_ACCESS) != 0)
 		list_flags |= MAILBOX_LIST_FLAG_FULL_FS_ACCESS;
+	if ((storage_flags & MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL) != 0)
+		list_flags |= MAILBOX_LIST_FLAG_DOTLOCK_USE_EXCL;
 	return list_flags;
 }
 

Index: mail-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- mail-storage.h	20 Dec 2006 19:23:44 -0000	1.123
+++ mail-storage.h	28 Dec 2006 16:28:31 -0000	1.124
@@ -31,8 +31,10 @@
 	/* Don't autocreate any directories. If they don't exist,
 	   fail to create the storage. */
 	MAIL_STORAGE_FLAG_NO_AUTOCREATE		= 0x200,
+	/* Rely on O_EXCL when creating dotlocks */
+	MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL	= 0x400,
 	/* Ths storage contains INBOX */
-	MAIL_STORAGE_FLAG_HAS_INBOX		= 0x400
+	MAIL_STORAGE_FLAG_HAS_INBOX		= 0x800
 };
 
 enum mailbox_open_flags {

Index: mailbox-list.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mailbox-list.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mailbox-list.h	15 Dec 2006 18:11:02 -0000	1.5
+++ mailbox-list.h	28 Dec 2006 16:28:32 -0000	1.6
@@ -10,7 +10,9 @@
 	/* This mailbox list contains INBOX. Match case-insensitively for it. */
 	MAILBOX_LIST_FLAG_INBOX			= 0x02,
 	/* Allow full filesystem access with absolute or relative paths. */
-	MAILBOX_LIST_FLAG_FULL_FS_ACCESS	= 0x04
+	MAILBOX_LIST_FLAG_FULL_FS_ACCESS	= 0x04,
+	/* Rely on O_EXCL when creating dotlocks */
+	MAILBOX_LIST_FLAG_DOTLOCK_USE_EXCL	= 0x08
 };
 
 enum mailbox_info_flags {