dovecot: Set pop3_uidl_format default to %08Xu%08Xv

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/12f6a19dc846
changeset: 6019:12f6a19dc846
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Jul 15 14:33:54 2007 +0300
description:
Set pop3_uidl_format default to %08Xu%08Xv

diffstat:

3 files changed, 5 insertions(+), 12 deletions(-)
dovecot-example.conf         |   13 +++----------
src/master/master-settings.c |    2 +-
src/pop3/main.c              |    2 +-

diffs (55 lines):

diff -r b148e4c41aa7 -r 12f6a19dc846 dovecot-example.conf
--- a/dovecot-example.conf	Sun Jul 15 10:00:05 2007 +0300
+++ b/dovecot-example.conf	Sun Jul 15 14:33:54 2007 +0300
@@ -623,24 +623,17 @@ protocol pop3 {
   #
   # If you want UIDL compatibility with other POP3 servers, use:
   #  UW's ipop3d         : %08Xv%08Xu
-  #  Courier version 0   : %f
-  #  Courier version 1   : %u
-  #  Courier version 2   : %v-%u
+  #  Courier             : %f or %v-%u (both might be used simultaneosly)
   #  Cyrus (<= 2.1.3)    : %u
   #  Cyrus (>= 2.1.4)    : %v.%u
-  #  Older Dovecots      : %v.%u
+  #  Dovecot v0.99.x     : %v.%u
   #  tpop3d              : %Mf
   #
   # 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.
   #
-  # 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_uidl_format = %08Xu%08Xv
 
   # POP3 logout format string:
   #  %i - total number of bytes read from client
diff -r b148e4c41aa7 -r 12f6a19dc846 src/master/master-settings.c
--- a/src/master/master-settings.c	Sun Jul 15 10:00:05 2007 +0300
+++ b/src/master/master-settings.c	Sun Jul 15 14:33:54 2007 +0300
@@ -274,7 +274,7 @@ struct settings default_settings = {
 	MEMBER(pop3_enable_last) FALSE,
 	MEMBER(pop3_reuse_xuidl) FALSE,
 	MEMBER(pop3_lock_session) FALSE,
-	MEMBER(pop3_uidl_format) "",
+	MEMBER(pop3_uidl_format) "%08Xu%08Xv",
 	MEMBER(pop3_client_workarounds) "",
 	MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s",
 
diff -r b148e4c41aa7 -r 12f6a19dc846 src/pop3/main.c
--- a/src/pop3/main.c	Sun Jul 15 10:00:05 2007 +0300
+++ b/src/pop3/main.c	Sun Jul 15 14:33:54 2007 +0300
@@ -220,7 +220,7 @@ static int main_init(void)
 
 	uidl_format = getenv("POP3_UIDL_FORMAT");
 	if (uidl_format == NULL || *uidl_format == '\0')
-		i_fatal("You must configure pop3_uidl_format in dovecot.conf");
+		uidl_format = "%08Xu%08Xv";
 	logout_format = getenv("POP3_LOGOUT_FORMAT");
 	if (logout_format == NULL)
 		logout_format = "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s";