]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Try to fix ambigious rvalue
authorVsevolod Stakhov <vsevolod@rspamd.com>
Sun, 28 Jul 2024 07:45:26 +0000 (08:45 +0100)
committerVsevolod Stakhov <vsevolod@rspamd.com>
Sat, 10 Aug 2024 09:40:14 +0000 (10:40 +0100)
src/libserver/cfg_rcl.cxx

index ce3df4010abc3eeb66c72be23d7f3d6ac6714126..8a479fa6d8d4fe6d9c493a04a348dd3a27feb5c5 100644 (file)
@@ -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);
        });