dovecot-2.0: Merged last changes

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/e4babf5f7eea
changeset: 12262:e4babf5f7eea
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 26 20:07:35 2010 +0100
description:
Merged last changes

diffstat:

 .hgsigs                                          |   1 +
 .hgtags                                          |   1 +
 NEWS                                             |  10 ++++++++++
 configure.in                                     |   2 +-
 src/config/old-set-parser.c                      |   7 +++++++
 src/lib-storage/index/dbox-common/dbox-storage.h |   2 +-
 src/lib-storage/mail-storage-service.c           |   6 ++++--
 7 files changed, 25 insertions(+), 4 deletions(-)

diffs (97 lines):

diff -r 96b75a5aa366 -r e4babf5f7eea .hgsigs
--- a/.hgsigs	Thu Aug 26 20:07:23 2010 +0100
+++ b/.hgsigs	Thu Aug 26 20:07:35 2010 +0100
@@ -14,3 +14,4 @@
 4a2d840a80bbe85e2101e3a5fb19424c3050f923 0 iEYEABECAAYFAkxhYVUACgkQyUhSUUBVisllmwCdFEJ8CzPbbzKZSKJbmgPTQj4lgP0AoKZXDAxxrs+lWB1kp3ECTyX3gW5T
 c5de2eb14a97e269cc3c6874fc6fdbafdac4edca 0 iEYEABECAAYFAkxljW0ACgkQyUhSUUBVislzOgCePgpbqsyJnDL2peSNvpS6ygVlTEEAn0B5PbmFdPTrelnSoneyG/CgmNVs
 d0d3ba81d2052258b099b9f660866369a56d4a9c 0 iEYEABECAAYFAkxpTKEACgkQyUhSUUBVisnZHgCfW/F0r/rVwHaxm7DNeisa2FVprooAn2c17typ1b38O+sagsqwD1IbPYzf
+8baa8ccb40216d626b9ca66309fca9437a76e6e2 0 iEYEABECAAYFAkxz/QQACgkQyUhSUUBViskVrwCfcB/267/lsPntHEyCkn5nG0cEP34AnjN9AzBApHkaHiDViRxS697HXbMj
diff -r 96b75a5aa366 -r e4babf5f7eea .hgtags
--- a/.hgtags	Thu Aug 26 20:07:23 2010 +0100
+++ b/.hgtags	Thu Aug 26 20:07:35 2010 +0100
@@ -51,3 +51,4 @@
 4a2d840a80bbe85e2101e3a5fb19424c3050f923 2.0.rc5
 c5de2eb14a97e269cc3c6874fc6fdbafdac4edca 2.0.rc6
 d0d3ba81d2052258b099b9f660866369a56d4a9c 2.0.0
+8baa8ccb40216d626b9ca66309fca9437a76e6e2 2.0.1
diff -r 96b75a5aa366 -r e4babf5f7eea NEWS
--- a/NEWS	Thu Aug 26 20:07:23 2010 +0100
+++ b/NEWS	Thu Aug 26 20:07:35 2010 +0100
@@ -1,3 +1,13 @@
+v2.0.1 2010-08-24  Timo Sirainen <tss at iki.fi>
+
+	* When dsync is started as root, remote dsync command is now also
+	  executed as root instead of with dropped privileges.
+
+	- IMAP: QRESYNC parameters for SELECT weren't handled correctly.
+	- UTF-8 string validity checking wasn't done correctly (e.g.
+	  mailbox names in Sieve fileinto)
+	- dsync: Fixed a random assert-crash with remote dsyncing
+
 v2.0.0 2010-08-16  Timo Sirainen <tss at iki.fi>
 
 	* Dovecot uses two system users for internal purposes now by default:
diff -r 96b75a5aa366 -r e4babf5f7eea configure.in
--- a/configure.in	Thu Aug 26 20:07:23 2010 +0100
+++ b/configure.in	Thu Aug 26 20:07:35 2010 +0100
@@ -1,5 +1,5 @@
 AC_PREREQ([2.59])
-AC_INIT([Dovecot],[2.0.0],[dovecot at dovecot.org])
+AC_INIT([Dovecot],[2.0.1],[dovecot at dovecot.org])
 AC_CONFIG_SRCDIR([src])
 
 AM_INIT_AUTOMAKE([foreign])
diff -r 96b75a5aa366 -r e4babf5f7eea src/config/old-set-parser.c
--- a/src/config/old-set-parser.c	Thu Aug 26 20:07:23 2010 +0100
+++ b/src/config/old-set-parser.c	Thu Aug 26 20:07:35 2010 +0100
@@ -38,8 +38,15 @@
 static void ATTR_FORMAT(2, 3)
 obsolete(struct config_parser_context *ctx, const char *str, ...)
 {
+	static bool seen_obsoletes = FALSE;
 	va_list args;
 
+	if (!seen_obsoletes) {
+		i_warning("NOTE: You can get a new clean config file with: "
+			  "doveconf -n > dovecot-new.conf");
+		seen_obsoletes = TRUE;
+	}
+
 	va_start(args, str);
 	i_warning("Obsolete setting in %s:%u: %s",
 		  ctx->cur_input->path, ctx->cur_input->linenum,
diff -r 96b75a5aa366 -r e4babf5f7eea src/lib-storage/index/dbox-common/dbox-storage.h
--- a/src/lib-storage/index/dbox-common/dbox-storage.h	Thu Aug 26 20:07:23 2010 +0100
+++ b/src/lib-storage/index/dbox-common/dbox-storage.h	Thu Aug 26 20:07:35 2010 +0100
@@ -11,7 +11,7 @@
 #define DBOX_SUBSCRIPTION_FILE_NAME "subscriptions"
 #define DBOX_UIDVALIDITY_FILE_NAME "dovecot-uidvalidity"
 #define DBOX_INDEX_PREFIX "dovecot.index"
-#define DBOX_TEMP_FILE_PREFIX "temp."
+#define DBOX_TEMP_FILE_PREFIX ".temp."
 
 #define DBOX_MAILBOX_DIR_NAME "mailboxes"
 #define DBOX_TRASH_DIR_NAME "trash"
diff -r 96b75a5aa366 -r e4babf5f7eea src/lib-storage/mail-storage-service.c
--- a/src/lib-storage/mail-storage-service.c	Thu Aug 26 20:07:23 2010 +0100
+++ b/src/lib-storage/mail-storage-service.c	Thu Aug 26 20:07:35 2010 +0100
@@ -317,7 +317,8 @@
 				dec2str(rset.uid));
 			return -1;
 		}
-	} else if (rset.uid == (uid_t)-1 && disallow_root) {
+	} else if (rset.uid == (uid_t)-1 &&
+		   disallow_root && current_euid == 0) {
 		*error_r = "User is missing UID (see mail_uid setting)";
 		return -1;
 	}
@@ -336,7 +337,8 @@
 				dec2str(rset.gid));
 			return -1;
 		}
-	} else if (rset.gid == (gid_t)-1 && disallow_root) {
+	} else if (rset.gid == (gid_t)-1 && disallow_root &&
+		   set->first_valid_gid > 0 && getegid() == 0) {
 		*error_r = "User is missing GID (see mail_gid setting)";
 		return -1;
 	}