Create missing index dir using the same permissions as the mailbox dir.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 0887d0bcd31e39d29278c7e1a7bf6591793b6d9e..50d55f5bcd1790885be2a72c27d17c547aee522f 100644 (file)
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -67,33 +67,6 @@ static void index_list_free(struct index_list *list)
        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_storage *storage, const char *name)
        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",