Mercurial > dovecot > original-hg > dovecot-1.2
changeset 3661:a745511d591e HEAD
pop3_uidl_format is now required to be explicitly set. There is no default
anymore.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 16 Oct 2005 17:59:12 +0300 |
| parents | f2d65601097c |
| children | 247501e81026 |
| files | dovecot-example.conf src/master/master-settings.c src/pop3/main.c |
| diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dovecot-example.conf Sun Oct 16 17:48:25 2005 +0300 +++ b/dovecot-example.conf Sun Oct 16 17:59:12 2005 +0300 @@ -473,11 +473,18 @@ # Courier version 2 : %v-%u # Cyrus (<= 2.1.3) : %u # Cyrus (>= 2.1.4) : %v.%u + # Older Dovecots : %v.%u # - # Note that Outlook 2003 seems to have problems with %v.%u format which is + # Note that Outlook 2003 seems to have problems with %v.%u format which was # Dovecot's default, so if you're building a new server it would be a good # idea to change this. %08Xu%08Xv should be pretty fail-safe. - #pop3_uidl_format = %v.%u + # + # NOTE: Nowadays this is required to be set explicitly, since the old + # default was bad but it couldn't be changed without breaking existing + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # + #pop3_uidl_format = # POP3 logout format string: # %t - number of TOP commands
--- a/src/master/master-settings.c Sun Oct 16 17:48:25 2005 +0300 +++ b/src/master/master-settings.c Sun Oct 16 17:59:12 2005 +0300 @@ -327,7 +327,7 @@ MEMBER(pop3_no_flag_updates) FALSE, MEMBER(pop3_enable_last) FALSE, MEMBER(pop3_reuse_xuidl) FALSE, - MEMBER(pop3_uidl_format) "%v.%u", + MEMBER(pop3_uidl_format) NULL, MEMBER(pop3_client_workarounds) NULL, MEMBER(pop3_logout_format) "top=%t/%T, retr=%r/%R, del=%d/%m, size=%s",
--- a/src/pop3/main.c Sun Oct 16 17:48:25 2005 +0300 +++ b/src/pop3/main.c Sun Oct 16 17:59:12 2005 +0300 @@ -186,7 +186,7 @@ uidl_format = getenv("POP3_UIDL_FORMAT"); if (uidl_format == NULL) - uidl_format = "%v.%u"; + i_fatal("Set pop3_uidl_format setting in config file"); logout_format = getenv("POP3_LOGOUT_FORMAT"); if (logout_format == NULL) logout_format = "top=%t/%T, retr=%r/%R, del=%d/%m, size=%s";