Selaa lähdekoodia

Merge pull request #14833 from RussWhitehead/initLDAP_8.0.x

HPCC-25705 initldap unable to bind sysuser on 389DS

Reviewed-By: Kevin Wang <kevin.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 4 vuotta sitten
vanhempi
commit
a941a83561
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      system/security/LdapSecurity/ldapconnection.cpp

+ 2 - 2
system/security/LdapSecurity/ldapconnection.cpp

@@ -557,8 +557,8 @@ public:
                 m_sysuser_dn.append("cn=").append(m_sysuser_commonname.str()).append(",").append(m_sysuser_basedn.str());
             else if(m_serverType == OPEN_LDAP)
             {
-                if (0==strcmp("Directory Manager",m_sysuser_commonname.str()))
-                    m_sysuser_dn.append("cn=").append(m_sysuser_commonname.str()).append(",").append(m_sysuser_basedn.str());
+                if (strstr(m_sysuser_commonname.str(), "Directory Manager"))
+                    m_sysuser_dn.append("cn=Directory Manager");
                 else
                     m_sysuser_dn.append("uid=").append(m_sysuser_commonname.str()).append(",").append(m_sysuser_basedn.str()).append(",").append(m_basedn.str());
             }