Changeset 228 for branches/samba-3.2.x/source/passdb

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/passdb

Files:

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

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

@@ -208 +208 @@
 {
         struct pdb_methods *pdb = pdb_get_methods();
-        struct samu *cache_copy;
+        struct samu *for_cache;
         const struct dom_sid *user_sid;
 
@@ -215 +215 @@
         }
 
-        cache_copy = samu_new(NULL);
-        if (cache_copy == NULL) {
+        for_cache = samu_new(NULL);
+        if (for_cache == NULL) {
                 return False;
         }
 
-        if (!pdb_copy_sam_account(cache_copy, sam_acct)) {
-                TALLOC_FREE(cache_copy);
+        if (!pdb_copy_sam_account(for_cache, sam_acct)) {
+                TALLOC_FREE(for_cache);
                 return False;
         }
 
-        user_sid = pdb_get_user_sid(cache_copy);
+        user_sid = pdb_get_user_sid(for_cache);
 
         memcache_add_talloc(NULL, PDB_GETPWSID_CACHE,
                             data_blob_const(user_sid, sizeof(*user_sid)),
-                            cache_copy);
+                            &for_cache);
 
         return True;
@@ -1151 +1151 @@
 static NTSTATUS pdb_default_update_login_attempts (struct pdb_methods *methods, struct samu *newpwd, bool success)
 {
-        return NT_STATUS_NOT_IMPLEMENTED;
+        /* Only the pdb_nds backend implements this, by
+         * default just return ok. */
+        return NT_STATUS_OK;
 }
 

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

@@ -2011 +2011 @@
                                         true,
                                         true);
-        if (rename_script) {
+        if (!rename_script) {
                 return NT_STATUS_NO_MEMORY;
         }