Mercurial > dovecot > core-2.2

changeset 9936:6fac2ade5dd6 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acl: Use namespace prefix when looking up global ACLs.
author Timo Sirainen <tss@iki.fi>
date Sun, 13 Sep 2009 21:22:53 -0400
parents 364ee96c6195
children 49cd8e736a8a
files src/plugins/acl/acl-backend-vfile.c
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/acl/acl-backend-vfile.c	Sun Sep 13 21:10:33 2009 -0400
+++ b/src/plugins/acl/acl-backend-vfile.c	Sun Sep 13 21:22:53 2009 -0400
@@ -151,8 +151,17 @@
 	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 */