Changeset 478 for vendor/current/source3/passdb

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

Location:

vendor/current/source3/passdb

Files:

• login_cache.c (modified) (3 diffs)
• pdb_ldap.c (modified) (3 diffs)
• secrets.c (modified) (5 diffs)

vendor/current/source3/passdb/login_cache.c

@@ -70 +70 @@
         LOGIN_CACHE *entry;
         uint32_t entry_timestamp = 0, bad_password_time = 0;
+        uint16_t acct_ctrl;
 
         if (!login_cache_init())
@@ -98 +99 @@
         if (tdb_unpack (databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
                         &entry_timestamp,
-                        &entry->acct_ctrl,
+                        &acct_ctrl,
                         &entry->bad_password_count,
                         &bad_password_time) == -1) {
@@ -106 +107 @@
                 return NULL;
         }
+
+        /*
+         * Deal with 32-bit acct_ctrl. In the tdb we only store 16-bit
+         * ("w" in SAM_CACHE_FORMAT). Fixes bug 7253.
+         */
+        entry->acct_ctrl = acct_ctrl;
 
         /* Deal with possible 64-bit time_t. */

vendor/current/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;

vendor/current/source3/passdb/secrets.c

@@ -325 +325 @@
 
 /**
+ * Form a key for fetching the machine previous trust account password
+ *
+ * @param domain domain name
+ *
+ * @return keystring
+ **/
+static const char *machine_prev_password_keystr(const char *domain)
+{
+        char *keystr;
+
+        keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+                                            SECRETS_MACHINE_PASSWORD_PREV, domain);
+        SMB_ASSERT(keystr != NULL);
+        return keystr;
+}
+
+/**
  * Form a key for fetching the machine trust account password
  *
@@ -572 +589 @@
 
 /************************************************************************
- Routine to delete the plaintext machine account password
+ Routine to delete the old plaintext machine account password if any
+************************************************************************/
+
+static bool secrets_delete_prev_machine_password(const char *domain)
+{
+        char *oldpass = (char *)secrets_fetch(machine_prev_password_keystr(domain), NULL);
+        if (oldpass == NULL) {
+                return true;
+        }
+        SAFE_FREE(oldpass);
+        return secrets_delete(machine_prev_password_keystr(domain));
+}
+
+/************************************************************************
+ Routine to delete the plaintext machine account password and old
+ password if any
 ************************************************************************/
 
 bool secrets_delete_machine_password(const char *domain)
 {
+        if (!secrets_delete_prev_machine_password(domain)) {
+                return false;
+        }
         return secrets_delete(machine_password_keystr(domain));
 }
 
 /************************************************************************
- Routine to delete the plaintext machine account password, sec channel type and
- last change time from secrets database
+ Routine to delete the plaintext machine account password, old password,
+ sec channel type and last change time from secrets database
 ************************************************************************/
 
 bool secrets_delete_machine_password_ex(const char *domain)
 {
+        if (!secrets_delete_prev_machine_password(domain)) {
+                return false;
+        }
         if (!secrets_delete(machine_password_keystr(domain))) {
                 return false;
@@ -606 +644 @@
 
 /************************************************************************
+ Routine to store the previous machine password (by storing the current password
+ as the old)
+************************************************************************/
+
+static bool secrets_store_prev_machine_password(const char *domain)
+{
+        char *oldpass;
+        bool ret;
+
+        oldpass = (char *)secrets_fetch(machine_password_keystr(domain), NULL);
+        if (oldpass == NULL) {
+                return true;
+        }
+        ret = secrets_store(machine_prev_password_keystr(domain), oldpass, strlen(oldpass)+1);
+        SAFE_FREE(oldpass);
+        return ret;
+}
+
+/************************************************************************
  Routine to set the plaintext machine account password for a realm
-the password is assumed to be a null terminated ascii string
+ the password is assumed to be a null terminated ascii string.
+ Before storing
 ************************************************************************/
 
@@ -617 +675 @@
         uint32 sec_channel_type;
 
+        if (!secrets_store_prev_machine_password(domain)) {
+                return false;
+        }
+
         ret = secrets_store(machine_password_keystr(domain), pass, strlen(pass)+1);
         if (!ret)
@@ -628 +690 @@
 
         return ret;
+}
+
+
+/************************************************************************
+ Routine to fetch the previous plaintext machine account password for a realm
+ the password is assumed to be a null terminated ascii string.
+************************************************************************/
+
+char *secrets_fetch_prev_machine_password(const char *domain)
+{
+        return (char *)secrets_fetch(machine_prev_password_keystr(domain), NULL);
 }