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 e4c47162b141b469823c7272c46dd5d1b039cf25..edf88cef9877fcb13e24544f0453c7938976e9c5 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 147769f8ec6ea884bd3bf21103bf0b160262b878..3771aa92e64a0a9557bbee67c6a48ccec816e06a 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 b8030586b16b82b88a231756fa20fdec6ff61a37..7de0678443b6f0bd5b8d554c1aecc6fd733a4d79 100644 (file)
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -67,7 +67,7 @@ static int imapc_quota_init(struct quota_root *_root, const char *args,
                {.param_name = NULL}
        };
 
-       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 fdce61202ec04e0d09bcb9321f49ca2e4818cf80..5aa2ea3c01f8b95b17a9071dd3207fa8698c777a 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -383,7 +383,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