From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Wed, 30 Mar 2022 20:15:00 +0000 (+0100)
Subject: [Minor] Also allow to set objects to null for disabling
X-Git-Tag: 3.3~329
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e96512e68ba5268c76b2ebbee45d14bee423a6d3;p=thirdparty%2Frspamd.git

[Minor] Also allow to set objects to null for disabling
---

diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index d875c0efe4..937a6af895 100644
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -334,6 +334,12 @@ rspamd_proxy_parse_upstream (rspamd_mempool_t *pool,
 		return FALSE;
 	}
 
+	if (ucl_object_type (obj) != UCL_NULL) {
+		msg_info_pool_check("upstream %s is disabled by setting it to NULL",
+				ucl_object_key (obj));
+		return TRUE;
+	}
+
 	if (!rspamd_config_is_enabled_from_ucl (pool, obj)) {
 		/* Upstream is valid but disabled */
 		msg_info_pool_check("upstream %s is disabled",
@@ -499,6 +505,12 @@ rspamd_proxy_parse_mirror (rspamd_mempool_t *pool,
 	ctx = pd->user_struct;
 	L = ctx->lua_state;
 
+	if (ucl_object_type (obj) != UCL_NULL) {
+		msg_info_pool_check("mirror %s is disabled by setting it to NULL",
+				ucl_object_key (obj));
+		return TRUE;
+	}
+
 	if (ucl_object_type (obj) != UCL_OBJECT) {
 		g_set_error (err, rspamd_proxy_quark (), 100,
 				"mirror option must be an object");
@@ -508,7 +520,7 @@ rspamd_proxy_parse_mirror (rspamd_mempool_t *pool,
 
 	if (!rspamd_config_is_enabled_from_ucl (pool, obj)) {
 		/* Upstream is valid but disabled */
-		msg_info_pool_check("upstream %s is disabled",
+		msg_info_pool_check("mirror %s is disabled",
 				ucl_object_lookup (obj, "name") ?
 				ucl_object_tostring(ucl_object_lookup (obj, "name")) :
 				ucl_object_key (obj));