From 9f78677281b8866a28af469dc7f437771f2a1b8f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 14 Jul 2020 16:04:56 +0200 Subject: CMake: Rename add_slaves() to add_links() Sorry! --- methods/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'methods') diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt index 8589484cf..d575382f7 100644 --- a/methods/CMakeLists.txt +++ b/methods/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries(ftp ${GNUTLS_LIBRARIES}) install(TARGETS file copy store gpgv cdrom http ftp rred rsh mirror RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/apt/methods) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods mirror mirror+ftp mirror+http mirror+https mirror+file mirror+copy) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods rsh ssh) -add_slaves(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) +add_links(${CMAKE_INSTALL_LIBEXECDIR}/apt/methods http https) -- cgit v1.2.3 From 9cb5a81168307e15f209173ad9286835bff2df65 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 14 Jul 2020 16:19:08 +0200 Subject: gpgv: Rename master to primary --- methods/gpgv.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'methods') diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 1ca62557c..5597e7cff 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -307,13 +307,13 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (exactKey == false) { - auto const master = SubKeyMapping.find(l); - if (master == SubKeyMapping.end()) + auto const primary = SubKeyMapping.find(l); + if (primary == SubKeyMapping.end()) continue; - auto const validsubkeysig = std::find_if(master->second.cbegin(), master->second.cend(), [&](auto const subkey) { + auto const validsubkeysig = std::find_if(primary->second.cbegin(), primary->second.cend(), [&](auto const subkey) { return IsTheSameKey(subkey, good) && std::find(Signers.Valid.cbegin(), Signers.Valid.cend(), subkey) != Signers.Valid.cend(); }); - if (validsubkeysig != master->second.cend()) + if (validsubkeysig != primary->second.cend()) { found = true; Signers.SignedBy.push_back(l); -- cgit v1.2.3