[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-storage.c, 1.145.2.12, 1.145.2.13

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv10420

Modified Files:
      Tag: branch_1_0
	mbox-storage.c 
Log Message:
~ in mbox root path wasn't expanded early enough



Index: mbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-storage.c,v
retrieving revision 1.145.2.12
retrieving revision 1.145.2.13
diff -u -d -r1.145.2.12 -r1.145.2.13
--- mbox-storage.c	11 Mar 2007 18:16:43 -0000	1.145.2.12
+++ mbox-storage.c	22 Mar 2007 15:59:17 -0000	1.145.2.13
@@ -341,6 +341,7 @@
 		size_t len = strlen(root_dir);
 		if (root_dir[len-1] == '/')
 			root_dir = t_strndup(root_dir, len-1);
+		root_dir = home_expand(root_dir);
 
 		/* make sure the directory exists */
 		if (*root_dir == '\0' ||
@@ -378,7 +379,7 @@
 	istorage->storage = mbox_storage;
 	istorage->storage.pool = pool;
 
-	istorage->dir = p_strdup(pool, home_expand(root_dir));
+	istorage->dir = p_strdup(pool, root_dir);
 	istorage->inbox_path = p_strdup(pool, home_expand(inbox_file));
 	istorage->index_dir = p_strdup(pool, home_expand(index_dir));
 	istorage->user = p_strdup(pool, user);