From 000030feb7a30f193197f1aab8a7b04a26b42735 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 6 Mar 2017 14:59:46 +0200 Subject: [PATCH] auth: Do not double-expand key in passdb dict when authenticating Broken by 79042f8c --- src/auth/db-dict.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/auth/db-dict.c b/src/auth/db-dict.c index 89d44d2118..a4c3b53ce7 100644 --- a/src/auth/db-dict.c +++ b/src/auth/db-dict.c @@ -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) {