commit 5088e54473b49b40e5ceab2fae2999619f31b7d3
author Deepak Kodihalli <dkodihal@in.ibm.com> Sun Oct 28 06:53:25 2018 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Mon Nov 19 21:37:57 2018 -0500
tree 705275d93bc109f11bf52d4c1f368851956f3123
parent 3b4d06a1812566d4095524f2242e272e0b9f449f

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 <dkodihal@in.ibm.com>
Signed-off-by: Nagaraju Goruganti <ngorugan@in.ibm.com>

phosphor-ldap-config/main.cpp

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 @@
     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<level::ERR>("Error starting LDAP Config App, configfile(s) are "
                         "missing, exiting!!!");