dovecot-1.2: Create missing index dir using the same permissions...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/25dd184fc947
changeset: 8773:25dd184fc947
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 23 13:41:50 2009 -0500
description:
Create missing index dir using the same permissions as the mailbox dir.

diffstat:

1 file changed, 1 insertion(+), 31 deletions(-)
src/lib-storage/index/index-storage.c |   32 +-------------------------------

diffs (49 lines):

diff -r dfcb8a6a4f5f -r 25dd184fc947 src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c	Mon Feb 23 13:40:01 2009 -0500
+++ b/src/lib-storage/index/index-storage.c	Mon Feb 23 13:41:50 2009 -0500
@@ -67,33 +67,6 @@ static void index_list_free(struct index
 	i_free(list);
 }
 
-static int stat_parent(struct mail_storage *storage, const char *path,
-		       mode_t *mode_r, gid_t *gid_r)
-{
-	struct stat st;
-	const char *p;
-
-	while ((p = strrchr(path, '/')) != NULL) {
-		path = t_strdup_until(path, p);
-		if (stat(path, &st) == 0) {
-			*mode_r = st.st_mode;
-			*gid_r = (st.st_mode & S_ISGID) != 0 ||
-				st.st_gid == getegid() ?
-				(gid_t)-1 : st.st_gid;
-			return 0;
-		}
-		if (errno != ENOENT) {
-			mail_storage_set_critical(storage,
-						  "stat(%s) failed: %m", path);
-			return -1;
-		}
-	}
-	/* use default permissions */
-	*mode_r = 0700;
-	*gid_r = (gid_t)-1;
-	return 0;
-}
-
 static int create_index_dir(struct mail_storage *storage, const char *name)
 {
 	const char *root_dir, *index_dir;
@@ -107,10 +80,7 @@ static int create_index_dir(struct mail_
 	if (strcmp(index_dir, root_dir) == 0 || *index_dir == '\0')
 		return 0;
 
-	/* get permissions from the parent directory */
-	if (stat_parent(storage, index_dir, &mode, &gid) < 0)
-		return -1;
-
+	mailbox_list_get_dir_permissions(storage->list, name, &mode, &gid);
 	if (mkdir_parents_chown(index_dir, mode, (uid_t)-1, gid) < 0 &&
 	    errno != EEXIST) {
 		mail_storage_set_critical(storage, "mkdir(%s) failed: %m",