commit e6500a493a156dd58a92b384c77aef2cbd3addac
author Patrick Williams <patrick@stwcx.xyz> Sat May 01 05:58:23 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Sat May 01 05:59:14 2021 -0500
tree 7836d83f4a96e3e00889cfa62e6254b0d6ccdc8a
parent 18c1b42c1612e0e8d8f5cd9973bba09b447c7185

use new sdbus++ camelcase

Change I17a8d7479556596a3cf252b3f4eae9c8df547189 will change
how sdbus++ generates names which start with an acronym.
Prepare for this by keying off the SDBUSPP_NEW_CAMELCASE
define to use the new format.

Changes:
    lDAP* -> ldap*

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idc0c2f33974d684d311b329806cac1a6235edc02

phosphor-ldap-config/ldap_config_mgr.cpp

diff --git a/phosphor-ldap-config/ldap_config_mgr.cpp b/phosphor-ldap-config/ldap_config_mgr.cpp
index 3021793..5dea8e8 100644
--- a/phosphor-ldap-config/ldap_config_mgr.cpp
+++ b/phosphor-ldap-config/ldap_config_mgr.cpp
@@ -76,27 +76,27 @@
 }
 
 std::string ConfigMgr::createConfig(
-    std::string lDAPServerURI, std::string lDAPBindDN, std::string lDAPBaseDN,
-    std::string lDAPBindDNPassword, CreateIface::SearchScope lDAPSearchScope,
-    CreateIface::Create::Type lDAPType, std::string groupNameAttribute,
+    std::string ldapServerURI, std::string ldapBindDN, std::string ldapBaseDN,
+    std::string ldapBindDNPassword, CreateIface::SearchScope ldapSearchScope,
+    CreateIface::Create::Type ldapType, std::string groupNameAttribute,
     std::string userNameAttribute)
 {
     bool secureLDAP = false;
 
-    if (isValidLDAPURI(lDAPServerURI, LDAPSscheme))
+    if (isValidLDAPURI(ldapServerURI, LDAPSscheme))
     {
         secureLDAP = true;
     }
-    else if (isValidLDAPURI(lDAPServerURI, LDAPscheme))
+    else if (isValidLDAPURI(ldapServerURI, LDAPscheme))
     {
         secureLDAP = false;
     }
     else
     {
         log<level::ERR>("bad LDAP Server URI",
-                        entry("LDAPSERVERURI=%s", lDAPServerURI.c_str()));
-        elog<InvalidArgument>(Argument::ARGUMENT_NAME("lDAPServerURI"),
-                              Argument::ARGUMENT_VALUE(lDAPServerURI.c_str()));
+                        entry("LDAPSERVERURI=%s", ldapServerURI.c_str()));
+        elog<InvalidArgument>(Argument::ARGUMENT_NAME("ldapServerURI"),
+                              Argument::ARGUMENT_VALUE(ldapServerURI.c_str()));
     }
 
     if (secureLDAP && !fs::exists(tlsCacertFile.c_str()))
@@ -106,20 +106,20 @@
         elog<NoCACertificate>();
     }
 
-    if (lDAPBindDN.empty())
+    if (ldapBindDN.empty())
     {
         log<level::ERR>("Not a valid LDAP BINDDN",
-                        entry("LDAPBINDDN=%s", lDAPBindDN.c_str()));
+                        entry("LDAPBINDDN=%s", ldapBindDN.c_str()));
         elog<InvalidArgument>(Argument::ARGUMENT_NAME("LDAPBindDN"),
-                              Argument::ARGUMENT_VALUE(lDAPBindDN.c_str()));
+                              Argument::ARGUMENT_VALUE(ldapBindDN.c_str()));
     }
 
-    if (lDAPBaseDN.empty())
+    if (ldapBaseDN.empty())
     {
         log<level::ERR>("Not a valid LDAP BASEDN",
-                        entry("LDAPBASEDN=%s", lDAPBaseDN.c_str()));
+                        entry("LDAPBASEDN=%s", ldapBaseDN.c_str()));
         elog<InvalidArgument>(Argument::ARGUMENT_NAME("LDAPBaseDN"),
-                              Argument::ARGUMENT_VALUE(lDAPBaseDN.c_str()));
+                              Argument::ARGUMENT_VALUE(ldapBaseDN.c_str()));
     }
 
     // With current implementation we support only two default LDAP server.
@@ -129,16 +129,16 @@
 
     std::string objPath;
 
-    if (static_cast<ConfigIface::Type>(lDAPType) == ConfigIface::Type::OpenLdap)
+    if (static_cast<ConfigIface::Type>(ldapType) == ConfigIface::Type::OpenLdap)
     {
         openLDAPConfigPtr.reset(nullptr);
         objPath = openLDAPDbusObjectPath;
         openLDAPConfigPtr = std::make_unique<Config>(
             bus, objPath.c_str(), configFilePath.c_str(), tlsCacertFile.c_str(),
-            tlsCertFile.c_str(), secureLDAP, lDAPServerURI, lDAPBindDN,
-            lDAPBaseDN, std::move(lDAPBindDNPassword),
-            static_cast<ConfigIface::SearchScope>(lDAPSearchScope),
-            static_cast<ConfigIface::Type>(lDAPType), false, groupNameAttribute,
+            tlsCertFile.c_str(), secureLDAP, ldapServerURI, ldapBindDN,
+            ldapBaseDN, std::move(ldapBindDNPassword),
+            static_cast<ConfigIface::SearchScope>(ldapSearchScope),
+            static_cast<ConfigIface::Type>(ldapType), false, groupNameAttribute,
             userNameAttribute, *this);
     }
     else
@@ -147,10 +147,10 @@
         objPath = ADDbusObjectPath;
         ADConfigPtr = std::make_unique<Config>(
             bus, objPath.c_str(), configFilePath.c_str(), tlsCacertFile.c_str(),
-            tlsCertFile.c_str(), secureLDAP, lDAPServerURI, lDAPBindDN,
-            lDAPBaseDN, std::move(lDAPBindDNPassword),
-            static_cast<ConfigIface::SearchScope>(lDAPSearchScope),
-            static_cast<ConfigIface::Type>(lDAPType), false, groupNameAttribute,
+            tlsCertFile.c_str(), secureLDAP, ldapServerURI, ldapBindDN,
+            ldapBaseDN, std::move(ldapBindDNPassword),
+            static_cast<ConfigIface::SearchScope>(ldapSearchScope),
+            static_cast<ConfigIface::Type>(ldapType), false, groupNameAttribute,
             userNameAttribute, *this);
     }
     restartService(nscdService);