Changeset 480 for trunk/server/source3/passdb/pdb_ldap.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/passdb/pdb_ldap.c (modified) (3 diffs)

trunk/server/source3/passdb/pdb_ldap.c

@@ -1108 +1108 @@
                         store_gid_sid_cache(primary_gsid,
                                             sampass->unix_pw->pw_gid);
-                        idmap_cache_set_sid2uid(primary_gsid,
+                        idmap_cache_set_sid2gid(primary_gsid,
                                                 sampass->unix_pw->pw_gid);
                 }
@@ -4443 +4443 @@
         state->current_entry = ldap_first_entry(ld, state->entries);
 
-        if (state->current_entry == NULL) {
-                ldap_msgfree(state->entries);
-                state->entries = NULL;
-                return false;
-        }
-
         return True;
 }
@@ -4491 +4485 @@
 
  retry:
+        if (state->current_entry == NULL) {
+                return false;
+        }
+
         if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
                 return False;