Prechádzať zdrojové kódy

FIX: Cannot add LDAP group with same name as existing user

Tested using ADSI Edit on private domain controller, and found that
sAMAccountName should not be specified. Corrected in the code and tested

Signed-off-by: William Whitehead <william.whitehead@lexisnexis.com>
William Whitehead 13 rokov pred
rodič
commit
407fee7ad4

+ 0 - 12
system/security/LdapSecurity/ldapconnection.cpp

@@ -3155,14 +3155,6 @@ public:
             oc_values
         };
 
-        char *act_values[] = {(char*)groupname, NULL};
-        LDAPMod act_attr = 
-        {
-            LDAP_MOD_ADD,
-            "sAMAccountName",
-            act_values
-        };
-
         char *member_values[] = {"", NULL};
         LDAPMod member_attr = 
         {
@@ -3176,10 +3168,6 @@ public:
         
         attrs[ind++] = &cn_attr;
         attrs[ind++] = &oc_attr;
-        if(m_ldapconfig->getServerType() == ACTIVE_DIRECTORY)
-        {
-            attrs[ind++] = &act_attr;
-        }
         if(m_ldapconfig->getServerType() == OPEN_LDAP)
         {
             attrs[ind++] = &member_attr;