auth-db-dict: Allow key name expansion

This allows expansion of dictionary keys based on userdb
variables on dict lookup mapping. Example:
key userdb {
  key = %{userdb:nspace:default}/userdb
  format = json
}

diff --git a/src/auth/db-dict.c b/src/auth/db-dict.c
index 6720de150d86c29c275b64b0cb46c3de3d1f3158..138ac0dc33d6c30a5cfd9062aac10ba7b99d6a31 100644 (file)
--- a/src/auth/db-dict.c
+++ b/src/auth/db-dict.c
@@ -457,7 +457,14 @@ int db_dict_value_iter_init(struct dict_connection *conn,
        p_array_init(&iter->keys, pool, array_count(&conn->set.keys));
        array_foreach(&conn->set.keys, key) {
                iterkey = array_append_space(&iter->keys);
-               iterkey->key = key;
+               struct db_dict_key *new_key = p_new(iter->pool, struct db_dict_key, 1);
+               memcpy(new_key, key, sizeof(struct db_dict_key));
+               string_t *expanded_key = str_new(iter->pool, strlen(key->key));
+               auth_request_var_expand_with_table(expanded_key, key->key, auth_request,
+                                                  iter->var_expand_table,
+                                                  NULL);
+               new_key->key = str_c(expanded_key);
+               iterkey->key = new_key;
        }
        T_BEGIN {
                db_dict_iter_find_used_keys(iter);