Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9152:ef644130d6c2 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acl: Handle empty rights (no rights) properly.
author Timo Sirainen <tss@iki.fi>
date Mon, 22 Jun 2009 00:28:33 -0400
parents 31fe9a8740c3
children f2426d980426
files src/plugins/acl/acl-backend-vfile.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/acl/acl-backend-vfile.c	Mon Jun 22 00:11:43 2009 -0400
+++ b/src/plugins/acl/acl-backend-vfile.c	Mon Jun 22 00:28:33 2009 -0400
@@ -881,12 +881,9 @@
 		return FALSE;
 	}
 
-	if (old_rights == NULL)
-		old_rights = &null;
-
 	switch (modify_mode) {
 	case ACL_MODIFY_MODE_REMOVE:
-		if (*old_rights == NULL) {
+		if (old_rights == NULL || *old_rights == NULL) {
 			/* nothing to do */
 			return FALSE;
 		}
@@ -922,6 +919,9 @@
 	}
 	*rightsp = new_rights;
 
+	if (old_rights == NULL)
+		return new_rights != NULL;
+
 	/* see if anything changed */
 	for (i = 0; old_rights[i] != NULL && new_rights[i] != NULL; i++) {
 		if (strcmp(old_rights[i], new_rights[i]) != 0)