From 5088e54473b49b40e5ceab2fae2999619f31b7d3 Mon Sep 17 00:00:00 2001 From: Deepak Kodihalli Date: Sun, 28 Oct 2018 06:53:25 -0500 Subject: React to nsswitch config file changes There's just one nsswitch config file now (instead of a default, an _linux and an _ldap). Make fixes in code relevant to this. Change-Id: I92362aac7a1f5e034cea06e9299f7e574dc2fab9 Signed-off-by: Deepak Kodihalli Signed-off-by: Nagaraju Goruganti --- phosphor-ldap-config/ldap_configuration.cpp | 15 --------------- phosphor-ldap-config/ldap_configuration.hpp | 2 -- phosphor-ldap-config/main.cpp | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) (limited to 'phosphor-ldap-config') diff --git a/phosphor-ldap-config/ldap_configuration.cpp b/phosphor-ldap-config/ldap_configuration.cpp index be6c1cc..8503929 100644 --- a/phosphor-ldap-config/ldap_configuration.cpp +++ b/phosphor-ldap-config/ldap_configuration.cpp @@ -53,9 +53,6 @@ void Config::delete_() fs::copy_file(configDir / defaultNslcdFile, LDAP_CONFIG_FILE, fs::copy_options::overwrite_existing); - - fs::copy_file(configDir / linuxNsSwitchFile, configDir / nsSwitchFile, - fs::copy_options::overwrite_existing); } catch (const std::exception& e) { @@ -441,18 +438,6 @@ std::string // With current implementation we support only one LDAP server. deleteObject(); - try - { - fs::path configDir = fs::path(configFilePath.c_str()).parent_path(); - fs::copy_file(configDir / LDAPNsSwitchFile, configDir / nsSwitchFile, - fs::copy_options::overwrite_existing); - } - catch (const std::exception& e) - { - log("Failed to rename Config Files while creating Object", - entry("ERR=%s", e.what())); - elog(); - } auto objPath = std::string(LDAP_CONFIG_DBUS_OBJ_PATH); configPtr = std::make_unique( diff --git a/phosphor-ldap-config/ldap_configuration.hpp b/phosphor-ldap-config/ldap_configuration.hpp index 0254d42..ad2c52a 100644 --- a/phosphor-ldap-config/ldap_configuration.hpp +++ b/phosphor-ldap-config/ldap_configuration.hpp @@ -18,8 +18,6 @@ namespace ldap { static constexpr auto defaultNslcdFile = "nslcd.conf.default"; static constexpr auto nsSwitchFile = "nsswitch.conf"; -static constexpr auto LDAPNsSwitchFile = "nsswitch_ldap.conf"; -static constexpr auto linuxNsSwitchFile = "nsswitch_linux.conf"; using namespace phosphor::logging; using namespace sdbusplus::xyz::openbmc_project::Common::Error; diff --git a/phosphor-ldap-config/main.cpp b/phosphor-ldap-config/main.cpp index adbfdd3..3ecc0ca 100644 --- a/phosphor-ldap-config/main.cpp +++ b/phosphor-ldap-config/main.cpp @@ -14,9 +14,7 @@ int main(int argc, char* argv[]) fs::path configDir = fs::path(LDAP_CONFIG_FILE).parent_path(); if (!fs::exists(configDir / phosphor::ldap::defaultNslcdFile) || - !fs::exists(configDir / phosphor::ldap::nsSwitchFile) || - (!fs::exists(configDir / phosphor::ldap::LDAPNsSwitchFile) && - !fs::exists(configDir / phosphor::ldap::linuxNsSwitchFile))) + !fs::exists(configDir / phosphor::ldap::nsSwitchFile)) { log("Error starting LDAP Config App, configfile(s) are " "missing, exiting!!!"); -- cgit v1.2.1