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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

Location:

branches/samba-3.3.x/source/passdb

Files:

• lookup_sid.c (modified) (2 diffs)
• pdb_interface.c (modified) (1 diff)
• pdb_ldap.c (modified) (3 diffs)

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

@@ -469 +469 @@
 
         if (num_rids) {
-                *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
+                *names = TALLOC_ZERO_ARRAY(mem_ctx, const char *, num_rids);
                 *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
 
@@ -475 +475 @@
                         return false;
                 }
+
+                for (i = 0; i < num_rids; i++)
+                        (*types)[i] = SID_NAME_UNKNOWN;
         } else {
                 *names = NULL;

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

@@ -1075 +1075 @@
                           "without algorithmic RIDs is chosen.\n"));
                 DEBUGADD(0, ("Please map all used groups using 'net groupmap "
-                             "add', set the maximum used RID using\n"));
-                DEBUGADD(0, ("'net setmaxrid' and remove the parameter\n"));
+                             "add', set the maximum used RID\n"));
+                DEBUGADD(0, ("and remove the parameter\n"));
                 return False;
         }

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",