dovecot-2.0: dbox: Don't set +x bit for created files.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/ba690c9aea70
changeset: 9886:ba690c9aea70
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Sep 06 19:01:13 2009 -0400
description:
dbox: Don't set +x bit for created files.

diffstat:

4 files changed, 6 insertions(+), 5 deletions(-)
src/lib-storage/index/dbox/dbox-file.c    |    4 ++--
src/lib-storage/index/dbox/dbox-map.c     |    2 +-
src/lib-storage/index/dbox/dbox-storage.c |    3 ++-
src/lib-storage/index/dbox/dbox-storage.h |    2 +-

diffs (51 lines):

diff -r af8424c95825 -r ba690c9aea70 src/lib-storage/index/dbox/dbox-file.c
--- a/src/lib-storage/index/dbox/dbox-file.c	Sun Sep 06 18:53:24 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-file.c	Sun Sep 06 19:01:13 2009 -0400
@@ -440,8 +440,8 @@ int dbox_create_fd(struct dbox_storage *
 	mode_t old_mask;
 	int fd;
 
-	old_mask = umask(0666 & ~storage->create_mode);
-	fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0777);
+	old_mask = umask(0666 & ~storage->dir_create_mode);
+	fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);
 	umask(old_mask);
 	if (fd == -1) {
 		mail_storage_set_critical(&storage->storage,
diff -r af8424c95825 -r ba690c9aea70 src/lib-storage/index/dbox/dbox-map.c
--- a/src/lib-storage/index/dbox/dbox-map.c	Sun Sep 06 18:53:24 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-map.c	Sun Sep 06 19:01:13 2009 -0400
@@ -69,7 +69,7 @@ void dbox_map_deinit(struct dbox_map **_
 
 static int dbox_map_mkdir_storage(struct dbox_storage *storage)
 {
-	if (mkdir_parents_chgrp(storage->storage_dir, storage->create_mode,
+	if (mkdir_parents_chgrp(storage->storage_dir, storage->dir_create_mode,
 				storage->create_gid,
 				storage->create_gid_origin) < 0 &&
 	    errno != EEXIST) {
diff -r af8424c95825 -r ba690c9aea70 src/lib-storage/index/dbox/dbox-storage.c
--- a/src/lib-storage/index/dbox/dbox-storage.c	Sun Sep 06 18:53:24 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-storage.c	Sun Sep 06 19:01:13 2009 -0400
@@ -80,7 +80,8 @@ dbox_storage_create(struct mail_storage 
 		     I_MIN(storage->set->dbox_max_open_files, 128));
 
 	storage->map = dbox_map_init(storage);
-	mailbox_list_get_dir_permissions(ns->list, NULL, &storage->create_mode,
+	mailbox_list_get_dir_permissions(ns->list, NULL,
+					 &storage->dir_create_mode,
 					 &storage->create_gid, &origin);
 	storage->create_gid_origin = p_strdup(_storage->pool, origin);
 	return 0;
diff -r af8424c95825 -r ba690c9aea70 src/lib-storage/index/dbox/dbox-storage.h
--- a/src/lib-storage/index/dbox/dbox-storage.h	Sun Sep 06 18:53:24 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-storage.h	Sun Sep 06 19:01:13 2009 -0400
@@ -49,7 +49,7 @@ struct dbox_storage {
 	struct dbox_map *map;
 
 	/* mode/gid to use for new dbox storage files */
-	mode_t create_mode;
+	mode_t dir_create_mode;
 	gid_t create_gid;
 	const char *create_gid_origin;