Mercurial > dovecot > core-2.2
changeset 22259:e6bb15e22709
quota: Fix failing again if quota setting has invalid parameters
This was broken by the recent quota parameter parsing changes.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 22 Jun 2017 11:43:05 +0300 |
| parents | a2e6b623fa38 |
| children | a2f31392caec |
| files | src/plugins/quota/quota-dict.c src/plugins/quota/quota-fs.c src/plugins/quota/quota-imapc.c src/plugins/quota/quota.c |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/quota/quota-dict.c Tue Jun 20 12:11:37 2017 +0300 +++ b/src/plugins/quota/quota-dict.c Thu Jun 22 11:43:05 2017 +0300 @@ -57,7 +57,8 @@ 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;
--- a/src/plugins/quota/quota-fs.c Tue Jun 20 12:11:37 2017 +0300 +++ b/src/plugins/quota/quota-fs.c Thu Jun 22 11:43:05 2017 +0300 @@ -126,7 +126,7 @@ {.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;
--- a/src/plugins/quota/quota-imapc.c Tue Jun 20 12:11:37 2017 +0300 +++ b/src/plugins/quota/quota-imapc.c Thu Jun 22 11:43:05 2017 +0300 @@ -67,7 +67,7 @@ {.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)
--- a/src/plugins/quota/quota.c Tue Jun 20 12:11:37 2017 +0300 +++ b/src/plugins/quota/quota.c Thu Jun 22 11:43:05 2017 +0300 @@ -383,7 +383,7 @@ 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