Mercurial > dovecot > original-hg > dovecot-1.2
changeset 4445:13350093fa1b HEAD
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.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 27 Jun 2006 13:27:25 +0300 |
| parents | d0d04db8e7a6 |
| children | 6d0ca893eab8 |
| files | src/deliver/deliver.c src/lib-storage/mail-storage.c |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver/deliver.c Tue Jun 27 12:25:55 2006 +0300 +++ b/src/deliver/deliver.c Tue Jun 27 13:27:25 2006 +0300 @@ -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 {
--- a/src/lib-storage/mail-storage.c Tue Jun 27 12:25:55 2006 +0300 +++ b/src/lib-storage/mail-storage.c Tue Jun 27 13:27:25 2006 +0300 @@ -3,6 +3,7 @@ #include "lib.h" #include "ioloop.h" #include "array.h" +#include "var-expand.h" #include "mail-storage-private.h" #include <stdlib.h> @@ -76,6 +77,11 @@ if (getenv("MAIL_SAVE_CRLF") != NULL) *flags_r |= MAIL_STORAGE_FLAG_SAVE_CRLF; + str = getenv("POP3_UIDL_FORMAT"); + if (str != NULL && (str = strchr(str, '%')) != NULL && + str != NULL && var_get_key(str + 1) == 'm') + *flags_r |= MAIL_STORAGE_FLAG_KEEP_HEADER_MD5; + str = getenv("LOCK_METHOD"); if (str == NULL || strcmp(str, "fcntl") == 0) *lock_method_r = MAIL_STORAGE_LOCK_FCNTL;