summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-12-30 09:56:06 +0000
committerGitHub <noreply@github.com>2023-12-30 09:56:06 +0000
commit33d3295d80519c38aa70c34a78465925f4c8b7ff (patch)
tree8fb9957ccb4315add8cede9496e69b13fcf1ad1e
parent001a14d89343d99a7cc6524b1eb2be00c177e93b (diff)
parent177e3e6f61fd1131459f3a9193f9937c19a9eeb0 (diff)
downloadrspamd-33d3295d80519c38aa70c34a78465925f4c8b7ff.tar.gz
rspamd-33d3295d80519c38aa70c34a78465925f4c8b7ff.zip
Merge pull request #4764 from jvoisin/anullptr
[Fix] Fix an overzealous s/NULL/nullptr/g
-rw-r--r--src/libserver/cfg_rcl.cxx2
-rw-r--r--src/libserver/cfg_utils.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx
index b43014a1c..3ac7560a8 100644
--- a/src/libserver/cfg_rcl.cxx
+++ b/src/libserver/cfg_rcl.cxx
@@ -2049,7 +2049,7 @@ rspamd_rcl_config_init(struct rspamd_config *cfg, GHashTable *skip_sections)
rspamd_rcl_parse_struct_string,
G_STRUCT_OFFSET(struct rspamd_config, ssl_ciphers),
0,
- "List of ssl ciphers (e.g. HIGH:!anullptr:!kRSA:!PSK:!SRP:!MD5:!RC4)");
+ "List of ssl ciphers (e.g. HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4)");
rspamd_rcl_add_default_handler(sub,
"max_message",
rspamd_rcl_parse_struct_integer,
diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx
index e22cbe9e3..3a94b47a9 100644
--- a/src/libserver/cfg_utils.cxx
+++ b/src/libserver/cfg_utils.cxx
@@ -326,7 +326,7 @@ rspamd_config_new(enum rspamd_config_init_flags flags)
*/
cfg->enable_shutdown_workaround = TRUE;
- cfg->ssl_ciphers = rspamd_mempool_strdup(cfg->cfg_pool, "HIGH:!anullptr:!kRSA:!PSK:!SRP:!MD5:!RC4");
+ cfg->ssl_ciphers = rspamd_mempool_strdup(cfg->cfg_pool, "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4");
cfg->max_message = DEFAULT_MAX_MESSAGE;
cfg->max_pic_size = DEFAULT_MAX_PIC;
cfg->images_cache_size = 256;