From: Timo Sirainen <tss@iki.fi>
Date: Mon, 14 Sep 2009 01:22:53 +0000 (-0400)
Subject: acl: Use namespace prefix when looking up global ACLs.
X-Git-Tag: 2.0.alpha1~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f35410e3121ced145c4d76da08be866a305b08cc;p=thirdparty%2Fdovecot%2Fcore.git

acl: Use namespace prefix when looking up global ACLs.

--HG--
branch : HEAD
---

diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c
index 9cabb120db..24090a7273 100644
--- a/src/plugins/acl/acl-backend-vfile.c
+++ b/src/plugins/acl/acl-backend-vfile.c
@@ -151,8 +151,17 @@ acl_backend_vfile_object_init(struct acl_backend *_backend,
 	aclobj = i_new(struct acl_object_vfile, 1);
 	aclobj->aclobj.backend = _backend;
 	aclobj->aclobj.name = i_strdup(name);
-	aclobj->global_path = backend->global_dir == NULL ? NULL :
-		i_strconcat(backend->global_dir, "/", name, NULL);
+
+	if (backend->global_dir != NULL) T_BEGIN {
+		struct mail_namespace *ns =
+			mailbox_list_get_namespace(_backend->list);
+		string_t *vname;
+
+		vname = t_str_new(128);
+		mail_namespace_get_vname(ns, vname, name);
+		aclobj->global_path = i_strconcat(backend->global_dir, "/",
+						  str_c(vname), NULL);
+	} T_END;
 
 	if (*name == '\0') {
 		/* the default ACL for mailbox list */