[dovecot-cvs] dovecot/src/deliver deliver.c,1.21,1.22

[cras at dovecot.org]

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

Modified Files:
	deliver.c 
Log Message:
MAIL_STORAGE_FLAG_KEEP_HEADER_MD5 flag was supposed to be set if
pop3_uidl_format contained %m. Added it now to mail_storage_parse_env() so
it's used everywhere.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- deliver.c	16 Jun 2006 09:30:07 -0000	1.21
+++ deliver.c	27 Jun 2006 10:27:25 -0000	1.22
@@ -345,7 +345,7 @@
 	const char *config_path = DEFAULT_CONFIG_FILE;
 	const char *mailbox = "INBOX";
 	const char *auth_socket, *env_tz;
-	const char *home, *destination, *user, *mail_env, *str;
+	const char *home, *destination, *user, *mail_env;
         const struct var_expand_table *table;
         enum mail_storage_flags flags;
         enum mail_storage_lock_method lock_method;
@@ -480,11 +480,6 @@
 		mail_env = expand_mail_env(mail_env, table);
 	}
 
-	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;
-
 	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;
 	else {