diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-07-28 08:45:26 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-07-28 08:45:26 +0100 |
| commit | 5a2dedd00eb68a5d4c7acda93fd3cc4f3bb2d358 (patch) | |
| tree | 73ee2fc8dc271b5aa47cca4fe0cfe9249c336723 /src | |
| parent | 08aad032fade28a4647d2f63e2f7196d5b402582 (diff) | |
| download | rspamd-5a2dedd00eb68a5d4c7acda93fd3cc4f3bb2d358.tar.gz rspamd-5a2dedd00eb68a5d4c7acda93fd3cc4f3bb2d358.zip | |
[Minor] Try to fix ambigious rvalue
Diffstat (limited to 'src')
| -rw-r--r-- | src/libserver/cfg_rcl.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx index ce3df4010..8a479fa6d 100644 --- a/src/libserver/cfg_rcl.cxx +++ b/src/libserver/cfg_rcl.cxx @@ -3623,7 +3623,8 @@ rspamd_config_parse_ucl(struct rspamd_config *cfg, auto &cfg_file = cfg_file_maybe.value(); /* Try to load keyfile if available */ - rspamd::util::raii_file::open(fmt::format("{}.key", filename), O_RDONLY).map([&](const auto &keyfile) { + auto keyfile_name = fmt::format("{}.key", filename); + rspamd::util::raii_file::open(keyfile_name, O_RDONLY).map([&](const auto &keyfile) { auto *kp_parser = ucl_parser_new(0); if (ucl_parser_add_fd(kp_parser, keyfile.get_fd())) { auto *kp_obj = ucl_parser_get_object(kp_parser); @@ -3632,8 +3633,8 @@ rspamd_config_parse_ucl(struct rspamd_config *cfg, decrypt_keypair = rspamd_keypair_from_ucl(kp_obj); if (decrypt_keypair == nullptr) { - msg_err_config_forced("cannot load keypair from %s.key: invalid keypair", - filename); + msg_err_config_forced("cannot load keypair from %s: invalid keypair", + keyfile_name.c_str()); } else { /* Add decryption support to UCL */ @@ -3645,8 +3646,8 @@ rspamd_config_parse_ucl(struct rspamd_config *cfg, ucl_object_unref(kp_obj); } else { - msg_err_config_forced("cannot load keypair from %s.key: %s", - filename, ucl_parser_get_error(kp_parser)); + msg_err_config_forced("cannot load keypair from %s: %s", + keyfile_name.c_str(), ucl_parser_get_error(kp_parser)); } ucl_parser_free(kp_parser); }); |