dict-sql: Fix setting $variables to iteration key when map had multiple values

diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c
index 459b98002d9df13e994941e46e2b5e849fb20f4d..696f3aed6ca21162a8972f95a11bcd106e8530c6 100644 (file)
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -757,7 +757,8 @@ static bool sql_dict_iterate(struct dict_iterate_context *_ctx,
                str_append_c(ctx->key, '/');
 
        count = sql_result_get_fields_count(ctx->result);
-       i = (ctx->flags & DICT_ITERATE_FLAG_NO_VALUE) != 0 ? 0 : 1;
+       i = (ctx->flags & DICT_ITERATE_FLAG_NO_VALUE) != 0 ? 0 :
+               ctx->map->values_count;
        sql_field_i = ctx->sql_fields_start_idx;
        for (p = ctx->map->pattern + ctx->pattern_prefix_len; *p != '\0'; p++) {
                if (*p != '$')