From: Timo Sirainen <tss@iki.fi>
Date: Mon, 6 Dec 2010 00:37:09 +0000 (+0000)
Subject: imap-acl, imap-quota: Compile fix for last change.
X-Git-Tag: 2.1.alpha1~453
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f750d1b4979a10bdede63e47aea6ea83d2c9e243;p=thirdparty%2Fdovecot%2Fcore.git

imap-acl, imap-quota: Compile fix for last change.
---

diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c
index e160b8eb85..ef3d64040d 100644
--- a/src/plugins/imap-acl/imap-acl-plugin.c
+++ b/src/plugins/imap-acl/imap-acl-plugin.c
@@ -58,7 +58,6 @@ acl_mailbox_open_as_admin(struct client_command_context *cmd, const char *name)
 	struct mail_namespace *ns;
 	struct mailbox *box;
 	const char *storage_name;
-	enum mailbox_name_status status;
 	int ret;
 
 	if (ACL_USER_CONTEXT(cmd->client->user) == NULL) {
@@ -66,19 +65,10 @@ acl_mailbox_open_as_admin(struct client_command_context *cmd, const char *name)
 		return NULL;
 	}
 
-	ns = client_find_namespace(cmd, name, &storage_name, &status);
+	ns = client_find_namespace(cmd, name, &storage_name);
 	if (ns == NULL)
 		return NULL;
 
-	switch (status) {
-	case MAILBOX_NAME_INVALID:
-	case MAILBOX_NAME_VALID:
-		client_fail_mailbox_name_status(cmd, name, NULL, status);
-		return NULL;
-	default:
-		break;
-	}
-
 	/* Force opening the mailbox so that we can give a nicer error message
 	   if mailbox isn't selectable but is listable. */
 	box = mailbox_alloc(ns->list, storage_name, ACL_MAILBOX_FLAGS |
@@ -330,7 +320,7 @@ static bool cmd_myrights(struct client_command_context *cmd)
 		return TRUE;
 	}
 
-	ns = client_find_namespace(cmd, mailbox, &storage_name, NULL);
+	ns = client_find_namespace(cmd, mailbox, &storage_name);
 	if (ns == NULL)
 		return TRUE;
 
diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c
index f06a2ccf3c..2817145b60 100644
--- a/src/plugins/imap-quota/imap-quota-plugin.c
+++ b/src/plugins/imap-quota/imap-quota-plugin.c
@@ -81,7 +81,7 @@ static bool cmd_getquotaroot(struct client_command_context *cmd)
 	if (!client_read_string_args(cmd, 1, &mailbox))
 		return FALSE;
 
-	ns = client_find_namespace(cmd, mailbox, &storage_name, NULL);
+	ns = client_find_namespace(cmd, mailbox, &storage_name);
 	if (ns == NULL)
 		return TRUE;