From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Thu, 14 Nov 2024 12:10:09 +0000 (+0100)
Subject: lib-storage: mailbox-list - Use mkdir_get_executable_mode() instead of local static... 
X-Git-Tag: 2.4.0~258
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec017dbd9b563924297850e00bb933ae8533a78b;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mailbox-list - Use mkdir_get_executable_mode() instead of local static version
---

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 9c89a08718..8f6b97a714 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -581,15 +581,6 @@ mailbox_list_get_event(const struct mailbox_list *list)
 	return list->event;
 }
 
-static mode_t get_dir_mode(mode_t mode)
-{
-	/* add the execute bit if either read or write bit is set */
-	if ((mode & 0600) != 0) mode |= 0100;
-	if ((mode & 0060) != 0) mode |= 0010;
-	if ((mode & 0006) != 0) mode |= 0001;
-	return mode;
-}
-
 struct mail_user *
 mailbox_list_get_user(const struct mailbox_list *list)
 {
@@ -704,8 +695,8 @@ mailbox_list_get_permissions_stat(struct mailbox_list *list, const char *path,
 	if (!S_ISDIR(st.st_mode)) {
 		/* we're getting permissions from a file.
 		   apply +x modes as necessary. */
-		permissions_r->dir_create_mode =
-			get_dir_mode(permissions_r->dir_create_mode);
+		permissions_r->dir_create_mode = mkdir_get_executable_mode(
+			permissions_r->dir_create_mode);
 	}
 
 	if (S_ISDIR(st.st_mode) && (st.st_mode & S_ISGID) != 0) {