Changeset 274 for branches/samba-3.3.x/source/passdb/pdb_ldap.c

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/passdb/pdb_ldap.c (modified) (3 diffs)

branches/samba-3.3.x/source/passdb/pdb_ldap.c

@@ -560 +560 @@
         }
 
-        if (!(username = smbldap_talloc_single_attribute(priv2ld(ldap_state),
+        if (!(username = smbldap_talloc_smallest_attribute(priv2ld(ldap_state),
                                         entry,
                                         "uid",
@@ -3283 +3283 @@
  
         if ((rc == LDAP_NAMING_VIOLATION) ||
+            (rc == LDAP_NOT_ALLOWED_ON_RDN) ||
             (rc == LDAP_OBJECT_CLASS_VIOLATION)) {
                 const char *attrs[] = { "sambaGroupType", "description",
@@ -3297 +3298 @@
 
         if ((rc == LDAP_NAMING_VIOLATION) ||
+            (rc == LDAP_NOT_ALLOWED_ON_RDN) ||
             (rc == LDAP_OBJECT_CLASS_VIOLATION)) {
                 const char *attrs[] = { "sambaGroupType", "description",