[dovecot-cvs] dovecot/src/lib-storage mail-storage.c, 1.60, 1.61 mail-storage.h, 1.116, 1.117

[tss at dovecot.org]

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

Modified Files:
	mail-storage.c mail-storage.h 
Log Message:
If the mail environment data contains mail format prefix, don't do any kind
of autodetection. Practically this means that mbox:/var/mail/user doesn't
work anymore.



Index: mail-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- mail-storage.c	17 Sep 2006 21:08:06 -0000	1.60
+++ mail-storage.c	9 Oct 2006 17:08:05 -0000	1.61
@@ -181,6 +181,9 @@
 	while (i_isalnum(*p)) p++;
 
 	if (*p == ':') {
+		/* no autodetection if the storage format is given. */
+		flags |= MAIL_STORAGE_FLAG_NO_AUTODETECTION;
+
 		name = t_strdup_until(data, p);
 		storage = mail_storage_create(name, p+1, user, flags,
 					      lock_method);

Index: mail-storage.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/mail-storage.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- mail-storage.h	17 Sep 2006 17:49:02 -0000	1.116
+++ mail-storage.h	9 Oct 2006 17:08:05 -0000	1.117
@@ -23,7 +23,10 @@
 	/* Use CRLF linefeeds when saving mails. */
 	MAIL_STORAGE_FLAG_SAVE_CRLF		= 0x40,
 	/* The storage points to shared namespaces */
-	MAIL_STORAGE_FLAG_SHARED_NAMESPACE	= 0x80
+	MAIL_STORAGE_FLAG_SHARED_NAMESPACE	= 0x80,
+	/* Don't try to autodetect anything, require that the given data 
+	   contains all the necessary information. */
+	MAIL_STORAGE_FLAG_NO_AUTODETECTION	= 0x100
 };
 
 enum mail_storage_lock_method {