From: Martti Rannanjärvi <martti.rannanjarvi@open-xchange.com>
Date: Mon, 21 Jan 2019 08:50:24 +0000 (+0200)
Subject: quota: Rename quota_set_resource() error_r to client_error_r
X-Git-Tag: 2.3.6~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b14b713811c679c2c2b456ea30aacc52f58da1de;p=thirdparty%2Fdovecot%2Fcore.git

quota: Rename quota_set_resource() error_r to client_error_r

Don't pass on the error from dict_init() to client, though.
---

diff --git a/src/plugins/imap-quota/imap-quota-plugin.c b/src/plugins/imap-quota/imap-quota-plugin.c
index d59ffc9e10..7863419b62 100644
--- a/src/plugins/imap-quota/imap-quota-plugin.c
+++ b/src/plugins/imap-quota/imap-quota-plugin.c
@@ -192,7 +192,7 @@ static bool cmd_setquota(struct client_command_context *cmd)
 	struct quota_root *root;
 	struct mail_user *owner;
         const struct imap_arg *args, *list_args;
-	const char *root_name, *name, *value_str, *error;
+	const char *root_name, *name, *value_str, *client_error;
 	uint64_t value;
 
 	/* <quota root> <resource limits> */
@@ -223,8 +223,8 @@ static bool cmd_setquota(struct client_command_context *cmd)
 			return TRUE;
 		}
 
-		if (quota_set_resource(root, name, value, &error) < 0) {
-			client_send_command_error(cmd, error);
+		if (quota_set_resource(root, name, value, &client_error) < 0) {
+			client_send_command_error(cmd, client_error);
 			return TRUE;
 		}
 	}
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 6058982841..70b7c3ea3a 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -816,13 +816,13 @@ quota_get_resource(struct quota_root *root, const char *mailbox_name,
 }
 
 int quota_set_resource(struct quota_root *root, const char *name,
-		       uint64_t value, const char **error_r)
+		       uint64_t value, const char **client_error_r)
 {
 	struct dict_transaction_context *trans;
 	const char *key, *error;
 
 	if (root->set->limit_set == NULL) {
-		*error_r = MAIL_ERRSTR_NO_PERMISSION;
+		*client_error_r = MAIL_ERRSTR_NO_PERMISSION;
 		return -1;
 	}
 	if (strcasecmp(name, QUOTA_NAME_STORAGE_KILOBYTES) == 0)
@@ -832,7 +832,8 @@ int quota_set_resource(struct quota_root *root, const char *name,
 	else if (strcasecmp(name, QUOTA_NAME_MESSAGES) == 0)
 		key = "messages";
 	else {
-		*error_r = t_strdup_printf("Unsupported resource name: %s", name);
+		*client_error_r = t_strdup_printf(
+			"Unsupported resource name: %s", name);
 		return -1;
 	}
 
@@ -845,8 +846,11 @@ int quota_set_resource(struct quota_root *root, const char *name,
 		if (mail_user_get_home(root->quota->user, &set.home_dir) <= 0)
 			set.home_dir = NULL;
 		if (dict_init(root->set->limit_set, &set,
-			      &root->limit_set_dict, error_r) < 0)
+			      &root->limit_set_dict, &error) < 0) {
+			i_error("dict_init() failed: %s", error);
+			*client_error_r = "Internal quota limit update error";
 			return -1;
+		}
 	}
 
 	trans = dict_transaction_begin(root->limit_set_dict);
@@ -854,7 +858,7 @@ int quota_set_resource(struct quota_root *root, const char *name,
 	dict_set(trans, key, dec2str(value));
 	if (dict_transaction_commit(&trans, &error) < 0) {
 		i_error("dict_transaction_commit() failed: %s", error);
-		*error_r = "Internal quota limit update error";
+		*client_error_r = "Internal quota limit update error";
 		return -1;
 	}
 	return 0;
diff --git a/src/plugins/quota/quota.h b/src/plugins/quota/quota.h
index 29a48f403a..8de2d8ef6f 100644
--- a/src/plugins/quota/quota.h
+++ b/src/plugins/quota/quota.h
@@ -113,7 +113,7 @@ quota_get_resource(struct quota_root *root, const char *mailbox_name,
 		   const char **error_r);
 /* Returns 0 if OK, -1 if error (eg. permission denied, invalid name). */
 int quota_set_resource(struct quota_root *root, const char *name,
-		       uint64_t value, const char **error_r);
+		       uint64_t value, const char **client_error_r);
 
 /* Start a new quota transaction. */
 struct quota_transaction_context *quota_transaction_begin(struct mailbox *box);