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 f1ac6385d8b44425275d3180e2e04d5a5944e8c2..8a09becfa9ffc3b35227e1a45f3e8ca2fb5fd499 100644 (file)
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -729,7 +729,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 != '$')