quota: Fix failing again if quota setting has invalid parameters

This was broken by the recent quota parameter parsing changes.

diff --git a/src/plugins/quota/quota-dict.c b/src/plugins/quota/quota-dict.c
index 1ce980791e76b59a65e53cfc77ef3bd7eeac4a31..c6bd16835b7366940f04938ac394531172e38802 100644 (file)
--- a/src/plugins/quota/quota-dict.c
+++ b/src/plugins/quota/quota-dict.c
@@ -57,7 +57,8 @@ static int dict_quota_init(struct quota_root *_root, const char *args,
        username = t_strdup_until(args, p);
        args = p+1;
 
-       quota_parse_parameters(_root, &args, error_r, dict_params, TRUE);
+       if (quota_parse_parameters(_root, &args, error_r, dict_params, FALSE) < 0)
+               i_unreached();
 
        if (*username == '\0')
                username = _root->quota->user->username;

diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index 333172d84c432f3a967b95f480844824651c4604..b21884a3f2ffa1b021103b9f8ed43558d1945d15 100644 (file)
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -126,7 +126,7 @@ static int fs_quota_init(struct quota_root *_root, const char *args,
                {.param_name = NULL}
        };
 
-       if (quota_parse_parameters(_root, &args, error_r, fs_params, FALSE) < 0)
+       if (quota_parse_parameters(_root, &args, error_r, fs_params, TRUE) < 0)
                return -1;
        _root->auto_updating = TRUE;
        return 0;

diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index 7ec82a7ac8bde475f63edfe082c5943749904a66..9682e975f7e1065a60458142e3b68ca089612d70 100644 (file)
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -69,7 +69,7 @@ static int imapc_quota_init(struct quota_root *_root, const char *args,
 
        _root->auto_updating = TRUE;
 
-       if (quota_parse_parameters(_root, &args, error_r, imapc_params, FALSE) < 0)
+       if (quota_parse_parameters(_root, &args, error_r, imapc_params, TRUE) < 0)
                return -1;
 
        if (root->box_name == NULL && root->root_name == NULL)

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index 06452edd0797801d70b89614e3fd09c535cf7000..0d26c0cd1023eae01c46406e50609d154c9630e8 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -385,7 +385,7 @@ int quota_root_default_init(struct quota_root *root, const char *args,
                quota_param_ns,
                {.param_name = NULL}
        };
-       return quota_parse_parameters(root, &args, error_r, default_params, FALSE);
+       return quota_parse_parameters(root, &args, error_r, default_params, TRUE);
 }
 
 static int