From: Timo Sirainen <tss@iki.fi>
Date: Mon, 5 Apr 2010 05:57:19 +0000 (+0300)
Subject: acl: Updating empty ACL to empty triggered unnecessary disk write.
X-Git-Tag: 2.0.beta5~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66396e5a8ee051fa901731b33814e74285ee14ff;p=thirdparty%2Fdovecot%2Fcore.git

acl: Updating empty ACL to empty triggered unnecessary disk write.

--HG--
branch : HEAD
---

diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c
index 252e4c14c1..a0aef57bc8 100644
--- a/src/plugins/acl/acl-backend-vfile.c
+++ b/src/plugins/acl/acl-backend-vfile.c
@@ -899,7 +899,7 @@ static bool modify_right_list(pool_t pool,
 			      enum acl_modify_mode modify_mode)
 {
 	const char *const *old_rights = *rightsp;
-	const char *const *new_rights;
+	const char *const *new_rights = NULL;
 	const char *null = NULL;
 	ARRAY_TYPE(const_string) rights;
 	unsigned int i, j;
@@ -945,10 +945,11 @@ static bool modify_right_list(pool_t pool,
 		*rightsp = NULL;
 		return TRUE;
 	}
+	i_assert(new_rights != NULL);
 	*rightsp = new_rights;
 
 	if (old_rights == NULL)
-		return new_rights != NULL;
+		return new_rights[0] != NULL;
 
 	/* see if anything changed */
 	for (i = 0; old_rights[i] != NULL && new_rights[i] != NULL; i++) {