Request 813 (accepted)

This request supersedes: request 782 (Show diff)

Overview

Request 813 (accepted)

Applied patch to fix ctl_mboxlist segfault

Created by dhoffend over 9 years ago
In state accepted
Supersedes 782

Submit cyrus-imapd

Submit package home:dhoffend...b:3.3:Updates / cyrus-imapd to package Kolab:3.3:Updates / cyrus-imapd

cyrus-imapd.spec Changed

cyrus-imapd-2.5-ctl_mboxlist-mbtype.patch Deleted

cyrus-imapd-2.5-ctl_mboxlist.patch Added

@@ -0,0 +1,37 @@
+--- 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) {

cyrus-imapd.dsc Changed

debian.changelog Changed

debian.series Changed

Build Results
RPM Lint

Refresh

Comments for request 813 1
Comments for request 782 2

dhoffend wrote over 9 years ago

Build's are okay, tested compiled result on debian 7, fix is working

timotheus wrote over 9 years ago

This is a huge change. I am anxious to put my vote on it. Do we want such a huge change on the Kolab Updates channel? Or better wait for Kolab 3.4, and the new version will fix it? If you want a certain bug to be fixed, I guess it is better to find a single patch that fixes it, and apply that only, instead of upgrading the full package?

dhoffend wrote over 9 years ago

The package works for me. But as timo stated. I don't know what else has changed in this cyrus release. ATM I can only guess. Sure a dedicated patch would be the best solution.

On the other hand, like timo said: 3.3 is around 5 month old and 3.4 is coming next month. If this segfault would be a big dealbreaker for many other users the voices would be much louder.

My guess is: I would rather spend time testing Kolab:Dev to prepare for a clean 3.4 release instead of backporting software that's supposed for the upcoming release.

Good question

Request History

dhoffend created request over 9 years ago

Applied patch to fix ctl_mboxlist segfault

dhoffend accepted request over 9 years ago

Please add a comment