From: Timo Sirainen <tss@iki.fi>
Date: Mon, 26 Jul 2010 18:11:13 +0000 (+0100)
Subject: lazy-expunge: Keep internal namespaces referenced. Fixes crash with dsync.
X-Git-Tag: 2.0.rc4~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb453ada41017805a07c24e3d0eaad5af6b7dddf;p=thirdparty%2Fdovecot%2Fcore.git

lazy-expunge: Keep internal namespaces referenced. Fixes crash with dsync.
---

diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index fcd41c8980..abae315eb0 100644
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -539,6 +539,7 @@ lazy_expunge_mail_namespaces_created(struct mail_namespace *namespaces)
 			mail_namespace_find_prefix(namespaces, name);
 		if (luser->lazy_ns[i] == NULL)
 			i_fatal("lazy_expunge: Unknown namespace: '%s'", name);
+		mail_namespace_ref(luser->lazy_ns[i]);
 
 		/* we don't want to override these namespaces' expunge/delete
 		   operations. */
@@ -547,18 +548,35 @@ lazy_expunge_mail_namespaces_created(struct mail_namespace *namespaces)
 	}
 	if (i == 0)
 		i_fatal("lazy_expunge: No namespaces defined");
-	for (; i < LAZY_NAMESPACE_COUNT; i++)
+	for (; i < LAZY_NAMESPACE_COUNT; i++) {
 		luser->lazy_ns[i] = luser->lazy_ns[i-1];
+		mail_namespace_ref(luser->lazy_ns[i]);
+	}
+}
+
+static void lazy_expunge_user_deinit(struct mail_user *user)
+{
+	struct lazy_expunge_mail_user *luser = LAZY_EXPUNGE_USER_CONTEXT(user);
+	unsigned int i;
+
+	for (i = 0; i < LAZY_NAMESPACE_COUNT; i++)
+		mail_namespace_unref(&luser->lazy_ns[i]);
+
+	luser->module_ctx.super.deinit(user);
 }
 
 static void lazy_expunge_mail_user_created(struct mail_user *user)
 {
+	struct mail_user_vfuncs *v = user->vlast;
 	struct lazy_expunge_mail_user *luser;
 	const char *env;
 
 	env = mail_user_plugin_getenv(user, "lazy_expunge");
 	if (env != NULL) {
 		luser = p_new(user->pool, struct lazy_expunge_mail_user, 1);
+		luser->module_ctx.super = *v;
+		user->vlast = &luser->module_ctx.super;
+		v->deinit = lazy_expunge_user_deinit;
 		luser->env = env;
 
 		MODULE_CONTEXT_SET(user, lazy_expunge_mail_user_module, luser);