From af9f1b4e42e9ae71428ae37d68662212a7ace587 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 28 Nov 2022 15:46:30 -0600 Subject: [PATCH] fix: potentially incorrect error message in rpc-server whitelist (#4264) Fixes #928. --- libtransmission/rpc-server.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc index 5efd84496..fc7109ccd 100644 --- a/libtransmission/rpc-server.cc +++ b/libtransmission/rpc-server.cc @@ -807,18 +807,8 @@ static auto parseWhitelist(std::string_view whitelist) auto const pos = whitelist.find_first_of(" ,;"sv); auto const token = tr_strvStrip(whitelist.substr(0, pos)); list.emplace_back(token); + tr_logAddInfo(fmt::format(_("Added '{entry}' to host whitelist"), fmt::arg("entry", token))); whitelist = pos == std::string_view::npos ? ""sv : whitelist.substr(pos + 1); - - if (token.find_first_of("+-"sv) != std::string_view::npos) - { - tr_logAddWarn(fmt::format( - _("Added '{entry}' to host whitelist and it has a '+' or '-'! Are you using an old ACL by mistake?"), - fmt::arg("entry", token))); - } - else - { - tr_logAddInfo(fmt::format(_("Added '{entry}' to host whitelist"), fmt::arg("entry", token))); - } } return list;