]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Do not double-expand key in passdb dict when authenticating
authorAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 6 Mar 2017 12:59:46 +0000 (14:59 +0200)
committerGitLab <gitlab@git.dovecot.net>
Sun, 12 Mar 2017 18:15:13 +0000 (20:15 +0200)
Broken by 79042f8c

src/auth/db-dict.c

index 89d44d2118102ca3344215b4e496952d230d4df8..a4c3b53ce7b572727818b44d2241826201b0fd3e 100644 (file)
@@ -413,12 +413,7 @@ static int db_dict_iter_lookup_key_values(struct db_dict_value_iter *iter)
                        continue;
 
                str_truncate(path, strlen(DICT_PATH_SHARED));
-               ret = var_expand(path, key->key->key, iter->var_expand_table, &error);
-               if (ret <= 0) {
-                       auth_request_log_error(iter->auth_request, AUTH_SUBSYS_DB,
-                               "Failed to expand key %s: %s", key->key->key, error);
-                       return -1;
-               }
+               str_append(path, key->key->key);
                ret = dict_lookup(iter->conn->dict, iter->pool,
                                  str_c(path), &key->value, &error);
                if (ret > 0) {