From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 2 Sep 2025 11:05:26 +0000 (+0200)
Subject: [Fix] Propagate unused Redis Sentinel options
X-Git-Tag: 3.13.2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa2b6de4aa70ec5530012ac6e9add62d99680760;p=thirdparty%2Frspamd.git

[Fix] Propagate unused Redis Sentinel options
---

diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua
index 195b7759f3..87f6bf419c 100644
--- a/lualib/lua_redis.lua
+++ b/lualib/lua_redis.lua
@@ -392,6 +392,22 @@ local function process_redis_opts(options, redis_params)
     redis_params['sentinel_masters_pattern'] = options['sentinel_masters_pattern']
   end
 
+  if options['sentinel_watch_time'] and not redis_params['sentinel_watch_time'] then
+    redis_params['sentinel_watch_time'] = options['sentinel_watch_time']
+  end
+
+  if options['sentinel_username'] and not redis_params['sentinel_username'] then
+    redis_params['sentinel_username'] = options['sentinel_username']
+  end
+
+  if options['sentinel_password'] and not redis_params['sentinel_password'] then
+    redis_params['sentinel_password'] = options['sentinel_password']
+  end
+
+  if options['sentinel_master_maxerrors'] and not redis_params['sentinel_master_maxerrors'] then
+    redis_params['sentinel_master_maxerrors'] = options['sentinel_master_maxerrors']
+  end
+
 end
 
 local function enrich_defaults(rspamd_config, module, redis_params)