Re: rename folder problem with 2.4.4

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Here's a patch to fix your problem.  I've pushed it to master,
and will make sure it goes into 2.4.5 :)

Bron.
>From 1988d5fa96f2df88150ece97838469faf092cba1 Mon Sep 17 00:00:00 2001
From: Bron Gondwana <brong@xxxxxxxxx>
Date: Fri, 19 Nov 2010 16:28:34 +1100
Subject: [PATCH] Bug 3342 - pass the correct ACL to mupdate on rename

---
 imap/mboxlist.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/imap/mboxlist.c b/imap/mboxlist.c
index 2a599ae..b27adc8 100644
--- a/imap/mboxlist.c
+++ b/imap/mboxlist.c
@@ -982,7 +982,6 @@ int mboxlist_renamemailbox(const char *oldname, const char *newname,
     struct mailbox *oldmailbox = NULL;
     struct mailbox *newmailbox = NULL;
     struct txn *tid;
-    char *newacl = NULL;
     const char *root = NULL;
     char *newpartition = NULL;
     char *mboxent = NULL;
@@ -1133,7 +1132,7 @@ int mboxlist_renamemailbox(const char *oldname, const char *newname,
 		r = mupdate_delete(mupdate_h, oldname);
 	    if (!r) r = mupdate_reserve(mupdate_h, newname, buf);
 	}
-	if (!r) r = mupdate_activate(mupdate_h, newname, buf, newacl);
+	if (!r) r = mupdate_activate(mupdate_h, newname, buf, newmailbox->acl);
 	if (r) {
 	    syslog(LOG_ERR,
 		   "MUPDATE: can't commit mailbox entry for '%s'",
@@ -1155,7 +1154,6 @@ int mboxlist_renamemailbox(const char *oldname, const char *newname,
     }
     
     /* free memory */
-    free(newacl); /* we're done with the new ACL */
     free(newpartition);
     free(mboxent);
 
-- 
1.7.2.3

----
Cyrus Home Page: http://www.cyrusimap.org/
List Archives/Info: http://lists.andrew.cmu.edu/pipermail/info-cyrus/

[Index of Archives]     [Cyrus SASL]     [Squirrel Mail]     [Asterisk PBX]     [Video For Linux]     [Photo]     [Yosemite News]     [gtk]     [KDE]     [Gimp on Windows]     [Steve's Art]

  Powered by Linux