[dovecot-cvs] dovecot/src/deliver deliver.c,1.6,1.7

[cras at dovecot.org]

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

Modified Files:
	deliver.c 
Log Message:
Parse also pop3_uidl_format setting for %m case, so we know to save the MD5
sum while parsing mbox.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- deliver.c	26 Apr 2005 11:43:37 -0000	1.6
+++ deliver.c	23 May 2005 19:51:38 -0000	1.7
@@ -419,8 +419,11 @@
 		flags |= MAIL_STORAGE_FLAG_MMAP_MAILS;
 	if (getenv("MAIL_SAVE_CRLF") != NULL)
 		flags |= MAIL_STORAGE_FLAG_SAVE_CRLF;
-	/*FIXME:if ((uidl_keymask & UIDL_MD5) != 0)
-		flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;*/
+
+	str = getenv("POP3_UIDL_FORMAT");
+	if (str != NULL && (str = strchr(str, '%')) != NULL &&
+	    str != NULL && var_get_key(str + 1) == 'm')
+		flags |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5;
 
 	str = getenv("LOCK_METHOD");
 	if (str == NULL || strcmp(str, "fcntl") == 0)