File cyrus-imapd-2.5-ctl_mboxlist.patch of Package cyrus-imapd

--- a/imap/ctl_mboxlist.c	2014-08-13 12:53:43.000000000 +0200
+++ b/imap/ctl_mboxlist.c	2015-02-01 22:36:05.679911537 +0100
@@ -215,12 +215,20 @@
 		    } // if (r = dlist_getatom())
 
 		    if (dl_ace->name && tmp) {
-			if (acl) {
-			    acl = strconcat(xstrdup(acl), "\t", dl_ace->name, "\t", tmp);
+			if (acl != NULL) {
+			    // Temporary placeholder for the original
+			    char *_acl = xstrdup(acl);
+			    acl = xmalloc(strlen(acl) + 2 + strlen(dl_ace->name) + strlen(tmp) + 1);
+			    sprintf(acl, "%s\t%s\t%s", _acl, dl_ace->name, tmp);
+			    free(_acl);
 			} else {
-			    acl = strconcat(dl_ace->name, "\t", tmp);
+			    acl = xmalloc(1 + strlen(dl_ace->name) + strlen(tmp) + 1);
+			    sprintf(acl, "%s\t%s", dl_ace->name, tmp);
 			}
+
+			syslog(LOG_DEBUG, "Mailbox ACL: '%s %s' (acl now: %s)", dl_ace->name, tmp, acl);
 		    }
+		    if (tmp) free(tmp);
 		}
 	    } else { // (dl_acl)
 		syslog(LOG_NOTICE, "Mailbox without an ACL: '%s'", name);
@@ -318,6 +326,10 @@
 
     switch (d->op) {
     case DUMP:
+	if ((mbtype & MBTYPE_DELETED) && (config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_STANDARD) && config_getstring(IMAPOPT_PROXYSERVERS)) {
+	    break;
+	}
+
 	if (!d->partition || !strcmp(d->partition, part)) {
 	    printf("%s\t%d %s %s\n", name, mbtype, part, acl);
 	    if (d->purge) {