r13576: This is the beginnings of moving the SAM_ACCOUNT data structure
[samba.git] / source3 / passdb / pdb_get_set.c
index 4a5a5759d4f63e568bcbe77aa8e7936c59b57797..c39eb7116280a964a765ce8234f9a4b3e314144a 100644 (file)
@@ -1,6 +1,6 @@
 /* 
    Unix SMB/CIFS implementation.
-   SAM_ACCOUNT access routines
+   struct samu access routines
    Copyright (C) Jeremy Allison                1996-2001
    Copyright (C) Luke Kenneth Casson Leighton  1996-1998
    Copyright (C) Gerald (Jerry) Carter         2000-2001
 #define PDB_NOT_QUITE_NULL ""
 
 /*********************************************************************
- Collection of get...() functions for SAM_ACCOUNT.
+ Collection of get...() functions for struct samu.
  ********************************************************************/
 
-uint16 pdb_get_acct_ctrl (const SAM_ACCOUNT *sampass)
+uint16 pdb_get_acct_ctrl (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.acct_ctrl);
+               return (sampass->acct_ctrl);
        else
                return (ACB_DISABLED);
 }
 
-time_t pdb_get_logon_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_logon_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.logon_time);
+               return (sampass->logon_time);
        else
                return (0);
 }
 
-time_t pdb_get_logoff_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_logoff_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.logoff_time);
+               return (sampass->logoff_time);
        else
                return (-1);
 }
 
-time_t pdb_get_kickoff_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_kickoff_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.kickoff_time);
+               return (sampass->kickoff_time);
        else
                return (-1);
 }
 
-time_t pdb_get_pass_last_set_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_bad_password_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.pass_last_set_time);
+               return (sampass->bad_password_time);
        else
                return (-1);
 }
 
-time_t pdb_get_pass_can_change_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_pass_last_set_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.pass_can_change_time);
+               return (sampass->pass_last_set_time);
        else
                return (-1);
 }
 
-time_t pdb_get_pass_must_change_time (const SAM_ACCOUNT *sampass)
+time_t pdb_get_pass_can_change_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.pass_must_change_time);
+               return (sampass->pass_can_change_time);
        else
                return (-1);
 }
 
-uint16 pdb_get_logon_divs (const SAM_ACCOUNT *sampass)
+time_t pdb_get_pass_must_change_time (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.logon_divs);
+               return (sampass->pass_must_change_time);
        else
                return (-1);
 }
 
-uint32 pdb_get_hours_len (const SAM_ACCOUNT *sampass)
+uint16 pdb_get_logon_divs (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.hours_len);
+               return (sampass->logon_divs);
        else
                return (-1);
 }
 
-const uint8* pdb_get_hours (const SAM_ACCOUNT *sampass)
+uint32 pdb_get_hours_len (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.hours);
+               return (sampass->hours_len);
+       else
+               return (-1);
+}
+
+const uint8* pdb_get_hours (const struct samu *sampass)
+{
+       if (sampass)
+               return (sampass->hours);
        else
                return (NULL);
 }
 
-const uint8* pdb_get_nt_passwd (const SAM_ACCOUNT *sampass)
+const uint8* pdb_get_nt_passwd (const struct samu *sampass)
 {
        if (sampass) {
-               SMB_ASSERT((!sampass->private.nt_pw.data) 
-                          || sampass->private.nt_pw.length == NT_HASH_LEN);
-               return ((uint8*)sampass->private.nt_pw.data);
+               SMB_ASSERT((!sampass->nt_pw.data) 
+                          || sampass->nt_pw.length == NT_HASH_LEN);
+               return ((uint8*)sampass->nt_pw.data);
        }
        else
                return (NULL);
 }
 
-const uint8* pdb_get_lanman_passwd (const SAM_ACCOUNT *sampass)
+const uint8* pdb_get_lanman_passwd (const struct samu *sampass)
 {
        if (sampass) {
-               SMB_ASSERT((!sampass->private.lm_pw.data) 
-                          || sampass->private.lm_pw.length == LM_HASH_LEN);
-               return ((uint8*)sampass->private.lm_pw.data);
+               SMB_ASSERT((!sampass->lm_pw.data) 
+                          || sampass->lm_pw.length == LM_HASH_LEN);
+               return ((uint8*)sampass->lm_pw.data);
        }
        else
                return (NULL);
 }
 
+const uint8* pdb_get_pw_history (const struct samu *sampass, uint32 *current_hist_len)
+{
+       if (sampass) {
+               SMB_ASSERT((!sampass->nt_pw_his.data) 
+                  || ((sampass->nt_pw_his.length % PW_HISTORY_ENTRY_LEN) == 0));
+               *current_hist_len = sampass->nt_pw_his.length / PW_HISTORY_ENTRY_LEN;
+               return ((uint8*)sampass->nt_pw_his.data);
+       } else {
+               *current_hist_len = 0;
+               return (NULL);
+       }
+}
+
 /* Return the plaintext password if known.  Most of the time
    it isn't, so don't assume anything magic about this function.
    
    Used to pass the plaintext to passdb backends that might 
    want to store more than just the NTLM hashes.
 */
-const char* pdb_get_plaintext_passwd (const SAM_ACCOUNT *sampass)
+const char* pdb_get_plaintext_passwd (const struct samu *sampass)
 {
        if (sampass) {
-               return (sampass->private.plaintext_pw);
+               return (sampass->plaintext_pw);
        }
        else
                return (NULL);
 }
-const DOM_SID *pdb_get_user_sid(const SAM_ACCOUNT *sampass)
+const DOM_SID *pdb_get_user_sid(const struct samu *sampass)
 {
        if (sampass) 
-               return &sampass->private.user_sid;
+               return &sampass->user_sid;
        else
                return (NULL);
 }
 
-const DOM_SID *pdb_get_group_sid(const SAM_ACCOUNT *sampass)
+const DOM_SID *pdb_get_group_sid(const struct samu *sampass)
 {
        if (sampass)
-               return &sampass->private.group_sid;
+               return &sampass->group_sid;
        else    
                return (NULL);
 }      
 
 /**
- * Get flags showing what is initalised in the SAM_ACCOUNT
- * @param sampass the SAM_ACCOUNT in question
+ * Get flags showing what is initalised in the struct samu
+ * @param sampass the struct samu in question
  * @return the flags indicating the members initialised in the struct.
  **/
  
-enum pdb_value_state pdb_get_init_flags (const SAM_ACCOUNT *sampass, enum pdb_elements element)
+enum pdb_value_state pdb_get_init_flags (const struct samu *sampass, enum pdb_elements element)
 {
        enum pdb_value_state ret = PDB_DEFAULT;
        
-        if (!sampass || !sampass->private.change_flags || !sampass->private.set_flags)
+        if (!sampass || !sampass->change_flags || !sampass->set_flags)
                return ret;
                
-        if (bitmap_query(sampass->private.set_flags, element)) {
+        if (bitmap_query(sampass->set_flags, element)) {
                DEBUG(11, ("element %d: SET\n", element)); 
                ret = PDB_SET;
        }
                
-        if (bitmap_query(sampass->private.change_flags, element)) {
+        if (bitmap_query(sampass->change_flags, element)) {
                DEBUG(11, ("element %d: CHANGED\n", element)); 
                ret = PDB_CHANGED;
        }
@@ -202,267 +223,270 @@ enum pdb_value_state pdb_get_init_flags (const SAM_ACCOUNT *sampass, enum pdb_el
         return ret;
 }
 
-const char* pdb_get_username (const SAM_ACCOUNT *sampass)
+const char* pdb_get_username (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.username);
+               return (sampass->username);
        else
                return (NULL);
 }
 
-const char* pdb_get_domain (const SAM_ACCOUNT *sampass)
+const char* pdb_get_domain (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.domain);
+               return (sampass->domain);
        else
                return (NULL);
 }
 
-const char* pdb_get_nt_username (const SAM_ACCOUNT *sampass)
+const char* pdb_get_nt_username (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.nt_username);
+               return (sampass->nt_username);
        else
                return (NULL);
 }
 
-const char* pdb_get_fullname (const SAM_ACCOUNT *sampass)
+const char* pdb_get_fullname (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.full_name);
+               return (sampass->full_name);
        else
                return (NULL);
 }
 
-const char* pdb_get_homedir (const SAM_ACCOUNT *sampass)
+const char* pdb_get_homedir (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.home_dir);
+               return (sampass->home_dir);
        else
                return (NULL);
 }
 
-const char* pdb_get_unix_homedir (const SAM_ACCOUNT *sampass)
+const char* pdb_get_unix_homedir (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.unix_home_dir);
+               return (sampass->unix_home_dir);
        else
                return (NULL);
 }
 
-const char* pdb_get_dir_drive (const SAM_ACCOUNT *sampass)
+const char* pdb_get_dir_drive (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.dir_drive);
+               return (sampass->dir_drive);
        else
                return (NULL);
 }
 
-const char* pdb_get_logon_script (const SAM_ACCOUNT *sampass)
+const char* pdb_get_logon_script (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.logon_script);
+               return (sampass->logon_script);
        else
                return (NULL);
 }
 
-const char* pdb_get_profile_path (const SAM_ACCOUNT *sampass)
+const char* pdb_get_profile_path (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.profile_path);
+               return (sampass->profile_path);
        else
                return (NULL);
 }
 
-const char* pdb_get_acct_desc (const SAM_ACCOUNT *sampass)
+const char* pdb_get_acct_desc (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.acct_desc);
+               return (sampass->acct_desc);
        else
                return (NULL);
 }
 
-const char* pdb_get_workstations (const SAM_ACCOUNT *sampass)
+const char* pdb_get_workstations (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.workstations);
+               return (sampass->workstations);
        else
                return (NULL);
 }
 
-const char* pdb_get_unknown_str (const SAM_ACCOUNT *sampass)
+const char* pdb_get_unknown_str (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.unknown_str);
+               return (sampass->unknown_str);
        else
                return (NULL);
 }
 
-const char* pdb_get_munged_dial (const SAM_ACCOUNT *sampass)
+const char* pdb_get_munged_dial (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.munged_dial);
+               return (sampass->munged_dial);
        else
                return (NULL);
 }
 
-uint32 pdb_get_unknown_3 (const SAM_ACCOUNT *sampass)
+uint16 pdb_get_bad_password_count(const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.unknown_3);
-       else
-               return (-1);
-}
-
-uint16 pdb_get_bad_password_count(const SAM_ACCOUNT *sampass)
-{
-       if (sampass)
-               return (sampass->private.bad_password_count);
+               return (sampass->bad_password_count);
        else
                return 0;
 }
 
-uint16 pdb_get_logon_count(const SAM_ACCOUNT *sampass)
+uint16 pdb_get_logon_count(const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.logon_count);
+               return (sampass->logon_count);
        else
                return 0;
 }
 
-uint32 pdb_get_unknown_6 (const SAM_ACCOUNT *sampass)
+uint32 pdb_get_unknown_6 (const struct samu *sampass)
 {
        if (sampass)
-               return (sampass->private.unknown_6);
+               return (sampass->unknown_6);
        else
                return (-1);
 }
 
-void *pdb_get_backend_private_data (const SAM_ACCOUNT *sampass, const struct pdb_methods *my_methods)
+void *pdb_get_backend_private_data (const struct samu *sampass, const struct pdb_methods *my_methods)
 {
-       if (sampass && my_methods == sampass->private.backend_private_methods)
-               return sampass->private.backend_private_data;
+       if (sampass && my_methods == sampass->backend_private_methods)
+               return sampass->backend_private_data;
        else
                return NULL;
 }
 
 /*********************************************************************
- Collection of set...() functions for SAM_ACCOUNT.
+ Collection of set...() functions for struct samu.
  ********************************************************************/
 
-BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 acct_ctrl, enum pdb_value_state flag)
+BOOL pdb_set_acct_ctrl (struct samu *sampass, uint16 acct_ctrl, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
                
-       sampass->private.acct_ctrl = acct_ctrl;
+       sampass->acct_ctrl = acct_ctrl;
 
        return pdb_set_init_flags(sampass, PDB_ACCTCTRL, flag);
 }
 
-BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_logon_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.logon_time = mytime;
+       sampass->logon_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_LOGONTIME, flag);
 }
 
-BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_logoff_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.logoff_time = mytime;
+       sampass->logoff_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_LOGOFFTIME, flag);
 }
 
-BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_kickoff_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.kickoff_time = mytime;
+       sampass->kickoff_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_KICKOFFTIME, flag);
 }
 
-BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_bad_password_time (struct samu *sampass, time_t mytime, 
+                               enum pdb_value_state flag)
+{
+       if (!sampass)
+               return False;
+
+       sampass->bad_password_time = mytime;
+
+       return pdb_set_init_flags(sampass, PDB_BAD_PASSWORD_TIME, flag);
+}
+
+BOOL pdb_set_pass_can_change_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.pass_can_change_time = mytime;
+       sampass->pass_can_change_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_CANCHANGETIME, flag);
 }
 
-BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_pass_must_change_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.pass_must_change_time = mytime;
+       sampass->pass_must_change_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_MUSTCHANGETIME, flag);
 }
 
-BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag)
+BOOL pdb_set_pass_last_set_time (struct samu *sampass, time_t mytime, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.pass_last_set_time = mytime;
+       sampass->pass_last_set_time = mytime;
 
        return pdb_set_init_flags(sampass, PDB_PASSLASTSET, flag);
 }
 
-BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len, enum pdb_value_state flag)
+BOOL pdb_set_hours_len (struct samu *sampass, uint32 len, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.hours_len = len;
+       sampass->hours_len = len;
 
        return pdb_set_init_flags(sampass, PDB_HOURSLEN, flag);
 }
 
-BOOL pdb_set_logon_divs (SAM_ACCOUNT *sampass, uint16 hours, enum pdb_value_state flag)
+BOOL pdb_set_logon_divs (struct samu *sampass, uint16 hours, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.logon_divs = hours;
+       sampass->logon_divs = hours;
 
        return pdb_set_init_flags(sampass, PDB_LOGONDIVS, flag);
 }
 
 /**
- * Set flags showing what is initalised in the SAM_ACCOUNT
- * @param sampass the SAM_ACCOUNT in question
+ * Set flags showing what is initalised in the struct samu
+ * @param sampass the struct samu in question
  * @param flag The *new* flag to be set.  Old flags preserved
  *             this flag is only added.  
  **/
  
-BOOL pdb_set_init_flags (SAM_ACCOUNT *sampass, enum pdb_elements element, enum pdb_value_state value_flag)
+BOOL pdb_set_init_flags (struct samu *sampass, enum pdb_elements element, enum pdb_value_state value_flag)
 {
-        if (!sampass || !sampass->mem_ctx)
+        if (!sampass || !sampass)
                 return False;
 
-        if (!sampass->private.set_flags) {
-               if ((sampass->private.set_flags = 
-                       bitmap_talloc(sampass->mem_ctx
+        if (!sampass->set_flags) {
+               if ((sampass->set_flags = 
+                       bitmap_talloc(sampass, 
                                        PDB_COUNT))==NULL) {
                        DEBUG(0,("bitmap_talloc failed\n"));
                        return False;
                }
         }
-        if (!sampass->private.change_flags) {
-               if ((sampass->private.change_flags = 
-                       bitmap_talloc(sampass->mem_ctx
+        if (!sampass->change_flags) {
+               if ((sampass->change_flags = 
+                       bitmap_talloc(sampass, 
                                        PDB_COUNT))==NULL) {
                        DEBUG(0,("bitmap_talloc failed\n"));
                        return False;
@@ -471,34 +495,34 @@ BOOL pdb_set_init_flags (SAM_ACCOUNT *sampass, enum pdb_elements element, enum p
         
         switch(value_flag) {
                case PDB_CHANGED:
-                       if (!bitmap_set(sampass->private.change_flags, element)) {
+                       if (!bitmap_set(sampass->change_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in change_flags.\n",element));
                                return False;
                        }
-                       if (!bitmap_set(sampass->private.set_flags, element)) {
+                       if (!bitmap_set(sampass->set_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in set_flags.\n",element));
                                return False;
                        }
                        DEBUG(11, ("element %d -> now CHANGED\n", element)); 
                        break;
                case PDB_SET:
-                       if (!bitmap_clear(sampass->private.change_flags, element)) {
+                       if (!bitmap_clear(sampass->change_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in change_flags.\n",element));
                                return False;
                        }
-                       if (!bitmap_set(sampass->private.set_flags, element)) {
+                       if (!bitmap_set(sampass->set_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in set_flags.\n",element));
                                return False;
                        }
-                       DEBUG(10, ("element %d -> now SET\n", element)); 
+                       DEBUG(11, ("element %d -> now SET\n", element)); 
                        break;
                case PDB_DEFAULT:
                default:
-                       if (!bitmap_clear(sampass->private.change_flags, element)) {
+                       if (!bitmap_clear(sampass->change_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in change_flags.\n",element));
                                return False;
                        }
-                       if (!bitmap_clear(sampass->private.set_flags, element)) {
+                       if (!bitmap_clear(sampass->set_flags, element)) {
                                DEBUG(0,("Can't set flag: %d in set_flags.\n",element));
                                return False;
                        }
@@ -509,20 +533,20 @@ BOOL pdb_set_init_flags (SAM_ACCOUNT *sampass, enum pdb_elements element, enum p
         return True;
 }
 
-BOOL pdb_set_user_sid (SAM_ACCOUNT *sampass, const DOM_SID *u_sid, enum pdb_value_state flag)
+BOOL pdb_set_user_sid (struct samu *sampass, const DOM_SID *u_sid, enum pdb_value_state flag)
 {
        if (!sampass || !u_sid)
                return False;
        
-       sid_copy(&sampass->private.user_sid, u_sid);
+       sid_copy(&sampass->user_sid, u_sid);
 
        DEBUG(10, ("pdb_set_user_sid: setting user sid %s\n", 
-                   sid_string_static(&sampass->private.user_sid)));
+                   sid_string_static(&sampass->user_sid)));
 
        return pdb_set_init_flags(sampass, PDB_USERSID, flag);
 }
 
-BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid, enum pdb_value_state flag)
+BOOL pdb_set_user_sid_from_string (struct samu *sampass, fstring u_sid, enum pdb_value_state flag)
 {
        DOM_SID new_sid;
        
@@ -538,27 +562,37 @@ BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid, enum pdb
        }
         
        if (!pdb_set_user_sid(sampass, &new_sid, flag)) {
-               DEBUG(1, ("pdb_set_user_sid_from_string: could not set sid %s on SAM_ACCOUNT!\n", u_sid));
+               DEBUG(1, ("pdb_set_user_sid_from_string: could not set sid %s on struct samu!\n", u_sid));
                return False;
        }
 
        return True;
 }
 
-BOOL pdb_set_group_sid (SAM_ACCOUNT *sampass, const DOM_SID *g_sid, enum pdb_value_state flag)
+BOOL pdb_set_group_sid (struct samu *sampass, const DOM_SID *g_sid, enum pdb_value_state flag)
 {
+       gid_t gid;
+
        if (!sampass || !g_sid)
                return False;
 
-       sid_copy(&sampass->private.group_sid, g_sid);
+       /* if we cannot resolve the SID to gid, then just ignore it and 
+          store DOMAIN_USERS as the primary groupSID */
+
+       if ( sid_to_gid( g_sid, &gid ) ) {
+               sid_copy(&sampass->group_sid, g_sid);
+       } else {
+               sid_copy( &sampass->group_sid, get_global_sam_sid() );
+               sid_append_rid( &sampass->group_sid, DOMAIN_GROUP_RID_USERS );
+       }
 
        DEBUG(10, ("pdb_set_group_sid: setting group sid %s\n", 
-                   sid_string_static(&sampass->private.group_sid)));
+                   sid_string_static(&sampass->group_sid)));
 
        return pdb_set_init_flags(sampass, PDB_GROUPSID, flag);
 }
 
-BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pdb_value_state flag)
+BOOL pdb_set_group_sid_from_string (struct samu *sampass, fstring g_sid, enum pdb_value_state flag)
 {
        DOM_SID new_sid;
        if (!sampass || !g_sid)
@@ -573,7 +607,7 @@ BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pd
        }
         
        if (!pdb_set_group_sid(sampass, &new_sid, flag)) {
-               DEBUG(1, ("pdb_set_group_sid_from_string: could not set sid %s on SAM_ACCOUNT!\n", g_sid));
+               DEBUG(1, ("pdb_set_group_sid_from_string: could not set sid %s on struct samu!\n", g_sid));
                return False;
        }
        return True;
@@ -583,24 +617,24 @@ BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pd
  Set the user's UNIX name.
  ********************************************************************/
 
-BOOL pdb_set_username(SAM_ACCOUNT *sampass, const char *username, enum pdb_value_state flag)
+BOOL pdb_set_username(struct samu *sampass, const char *username, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
  
        if (username) { 
                DEBUG(10, ("pdb_set_username: setting username %s, was %s\n", username,
-                       (sampass->private.username)?(sampass->private.username):"NULL"));
+                       (sampass->username)?(sampass->username):"NULL"));
 
-               sampass->private.username = talloc_strdup(sampass->mem_ctx, username);
+               sampass->username = talloc_strdup(sampass, username);
 
-               if (!sampass->private.username) {
+               if (!sampass->username) {
                        DEBUG(0, ("pdb_set_username: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.username = PDB_NOT_QUITE_NULL;
+               sampass->username = PDB_NOT_QUITE_NULL;
        }
        
        return pdb_set_init_flags(sampass, PDB_USERNAME, flag);
@@ -610,24 +644,24 @@ BOOL pdb_set_username(SAM_ACCOUNT *sampass, const char *username, enum pdb_value
  Set the domain name.
  ********************************************************************/
 
-BOOL pdb_set_domain(SAM_ACCOUNT *sampass, const char *domain, enum pdb_value_state flag)
+BOOL pdb_set_domain(struct samu *sampass, const char *domain, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (domain) { 
                DEBUG(10, ("pdb_set_domain: setting domain %s, was %s\n", domain,
-                       (sampass->private.domain)?(sampass->private.domain):"NULL"));
+                       (sampass->domain)?(sampass->domain):"NULL"));
 
-               sampass->private.domain = talloc_strdup(sampass->mem_ctx, domain);
+               sampass->domain = talloc_strdup(sampass, domain);
 
-               if (!sampass->private.domain) {
+               if (!sampass->domain) {
                        DEBUG(0, ("pdb_set_domain: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.domain = PDB_NOT_QUITE_NULL;
+               sampass->domain = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_DOMAIN, flag);
@@ -637,24 +671,24 @@ BOOL pdb_set_domain(SAM_ACCOUNT *sampass, const char *domain, enum pdb_value_sta
  Set the user's NT name.
  ********************************************************************/
 
-BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, const char *nt_username, enum pdb_value_state flag)
+BOOL pdb_set_nt_username(struct samu *sampass, const char *nt_username, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (nt_username) { 
                DEBUG(10, ("pdb_set_nt_username: setting nt username %s, was %s\n", nt_username,
-                       (sampass->private.nt_username)?(sampass->private.nt_username):"NULL"));
+                       (sampass->nt_username)?(sampass->nt_username):"NULL"));
  
-               sampass->private.nt_username = talloc_strdup(sampass->mem_ctx, nt_username);
+               sampass->nt_username = talloc_strdup(sampass, nt_username);
                
-               if (!sampass->private.nt_username) {
+               if (!sampass->nt_username) {
                        DEBUG(0, ("pdb_set_nt_username: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.nt_username = PDB_NOT_QUITE_NULL;
+               sampass->nt_username = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_NTUSERNAME, flag);
@@ -664,24 +698,24 @@ BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, const char *nt_username, enum pdb
  Set the user's full name.
  ********************************************************************/
 
-BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *full_name, enum pdb_value_state flag)
+BOOL pdb_set_fullname(struct samu *sampass, const char *full_name, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (full_name) { 
                DEBUG(10, ("pdb_set_full_name: setting full name %s, was %s\n", full_name,
-                       (sampass->private.full_name)?(sampass->private.full_name):"NULL"));
+                       (sampass->full_name)?(sampass->full_name):"NULL"));
        
-               sampass->private.full_name = talloc_strdup(sampass->mem_ctx, full_name);
+               sampass->full_name = talloc_strdup(sampass, full_name);
 
-               if (!sampass->private.full_name) {
+               if (!sampass->full_name) {
                        DEBUG(0, ("pdb_set_fullname: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.full_name = PDB_NOT_QUITE_NULL;
+               sampass->full_name = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_FULLNAME, flag);
@@ -691,24 +725,24 @@ BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *full_name, enum pdb_valu
  Set the user's logon script.
  ********************************************************************/
 
-BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, enum pdb_value_state flag)
+BOOL pdb_set_logon_script(struct samu *sampass, const char *logon_script, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (logon_script) { 
                DEBUG(10, ("pdb_set_logon_script: setting logon script %s, was %s\n", logon_script,
-                       (sampass->private.logon_script)?(sampass->private.logon_script):"NULL"));
+                       (sampass->logon_script)?(sampass->logon_script):"NULL"));
  
-               sampass->private.logon_script = talloc_strdup(sampass->mem_ctx, logon_script);
+               sampass->logon_script = talloc_strdup(sampass, logon_script);
 
-               if (!sampass->private.logon_script) {
+               if (!sampass->logon_script) {
                        DEBUG(0, ("pdb_set_logon_script: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.logon_script = PDB_NOT_QUITE_NULL;
+               sampass->logon_script = PDB_NOT_QUITE_NULL;
        }
        
        return pdb_set_init_flags(sampass, PDB_LOGONSCRIPT, flag);
@@ -718,24 +752,24 @@ BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, enum p
  Set the user's profile path.
  ********************************************************************/
 
-BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, enum pdb_value_state flag)
+BOOL pdb_set_profile_path (struct samu *sampass, const char *profile_path, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (profile_path) { 
                DEBUG(10, ("pdb_set_profile_path: setting profile path %s, was %s\n", profile_path,
-                       (sampass->private.profile_path)?(sampass->private.profile_path):"NULL"));
+                       (sampass->profile_path)?(sampass->profile_path):"NULL"));
  
-               sampass->private.profile_path = talloc_strdup(sampass->mem_ctx, profile_path);
+               sampass->profile_path = talloc_strdup(sampass, profile_path);
                
-               if (!sampass->private.profile_path) {
+               if (!sampass->profile_path) {
                        DEBUG(0, ("pdb_set_profile_path: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.profile_path = PDB_NOT_QUITE_NULL;
+               sampass->profile_path = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_PROFILE, flag);
@@ -745,24 +779,24 @@ BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, enum
  Set the user's directory drive.
  ********************************************************************/
 
-BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, enum pdb_value_state flag)
+BOOL pdb_set_dir_drive (struct samu *sampass, const char *dir_drive, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (dir_drive) { 
                DEBUG(10, ("pdb_set_dir_drive: setting dir drive %s, was %s\n", dir_drive,
-                       (sampass->private.dir_drive)?(sampass->private.dir_drive):"NULL"));
+                       (sampass->dir_drive)?(sampass->dir_drive):"NULL"));
  
-               sampass->private.dir_drive = talloc_strdup(sampass->mem_ctx, dir_drive);
+               sampass->dir_drive = talloc_strdup(sampass, dir_drive);
                
-               if (!sampass->private.dir_drive) {
+               if (!sampass->dir_drive) {
                        DEBUG(0, ("pdb_set_dir_drive: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.dir_drive = PDB_NOT_QUITE_NULL;
+               sampass->dir_drive = PDB_NOT_QUITE_NULL;
        }
        
        return pdb_set_init_flags(sampass, PDB_DRIVE, flag);
@@ -772,24 +806,24 @@ BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, enum pdb_va
  Set the user's home directory.
  ********************************************************************/
 
-BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *home_dir, enum pdb_value_state flag)
+BOOL pdb_set_homedir (struct samu *sampass, const char *home_dir, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (home_dir) { 
                DEBUG(10, ("pdb_set_homedir: setting home dir %s, was %s\n", home_dir,
-                       (sampass->private.home_dir)?(sampass->private.home_dir):"NULL"));
+                       (sampass->home_dir)?(sampass->home_dir):"NULL"));
  
-               sampass->private.home_dir = talloc_strdup(sampass->mem_ctx, home_dir);
+               sampass->home_dir = talloc_strdup(sampass, home_dir);
                
-               if (!sampass->private.home_dir) {
+               if (!sampass->home_dir) {
                        DEBUG(0, ("pdb_set_home_dir: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.home_dir = PDB_NOT_QUITE_NULL;
+               sampass->home_dir = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_SMBHOME, flag);
@@ -799,25 +833,25 @@ BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *home_dir, enum pdb_value
  Set the user's unix home directory.
  ********************************************************************/
 
-BOOL pdb_set_unix_homedir (SAM_ACCOUNT *sampass, const char *unix_home_dir, enum pdb_value_state flag)
+BOOL pdb_set_unix_homedir (struct samu *sampass, const char *unix_home_dir, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (unix_home_dir) { 
                DEBUG(10, ("pdb_set_unix_homedir: setting home dir %s, was %s\n", unix_home_dir,
-                       (sampass->private.unix_home_dir)?(sampass->private.unix_home_dir):"NULL"));
+                       (sampass->unix_home_dir)?(sampass->unix_home_dir):"NULL"));
  
-               sampass->private.unix_home_dir = talloc_strdup(sampass->mem_ctx
+               sampass->unix_home_dir = talloc_strdup(sampass
                                                          unix_home_dir);
                
-               if (!sampass->private.unix_home_dir) {
+               if (!sampass->unix_home_dir) {
                        DEBUG(0, ("pdb_set_unix_home_dir: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.unix_home_dir = PDB_NOT_QUITE_NULL;
+               sampass->unix_home_dir = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_UNIXHOMEDIR, flag);
@@ -827,21 +861,21 @@ BOOL pdb_set_unix_homedir (SAM_ACCOUNT *sampass, const char *unix_home_dir, enum
  Set the user's account description.
  ********************************************************************/
 
-BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, const char *acct_desc, enum pdb_value_state flag)
+BOOL pdb_set_acct_desc (struct samu *sampass, const char *acct_desc, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (acct_desc) { 
-               sampass->private.acct_desc = talloc_strdup(sampass->mem_ctx, acct_desc);
+               sampass->acct_desc = talloc_strdup(sampass, acct_desc);
 
-               if (!sampass->private.acct_desc) {
+               if (!sampass->acct_desc) {
                        DEBUG(0, ("pdb_set_acct_desc: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.acct_desc = PDB_NOT_QUITE_NULL;
+               sampass->acct_desc = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_ACCTDESC, flag);
@@ -851,24 +885,24 @@ BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, const char *acct_desc, enum pdb_va
  Set the user's workstation allowed list.
  ********************************************************************/
 
-BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, const char *workstations, enum pdb_value_state flag)
+BOOL pdb_set_workstations (struct samu *sampass, const char *workstations, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (workstations) { 
                DEBUG(10, ("pdb_set_workstations: setting workstations %s, was %s\n", workstations,
-                       (sampass->private.workstations)?(sampass->private.workstations):"NULL"));
+                       (sampass->workstations)?(sampass->workstations):"NULL"));
  
-               sampass->private.workstations = talloc_strdup(sampass->mem_ctx, workstations);
+               sampass->workstations = talloc_strdup(sampass, workstations);
 
-               if (!sampass->private.workstations) {
+               if (!sampass->workstations) {
                        DEBUG(0, ("pdb_set_workstations: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.workstations = PDB_NOT_QUITE_NULL;
+               sampass->workstations = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_WORKSTATIONS, flag);
@@ -878,21 +912,21 @@ BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, const char *workstations, enum
  Set the user's 'unknown_str', whatever the heck this actually is...
  ********************************************************************/
 
-BOOL pdb_set_unknown_str (SAM_ACCOUNT *sampass, const char *unknown_str, enum pdb_value_state flag)
+BOOL pdb_set_unknown_str (struct samu *sampass, const char *unknown_str, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (unknown_str) { 
-               sampass->private.unknown_str = talloc_strdup(sampass->mem_ctx, unknown_str);
+               sampass->unknown_str = talloc_strdup(sampass, unknown_str);
                
-               if (!sampass->private.unknown_str) {
+               if (!sampass->unknown_str) {
                        DEBUG(0, ("pdb_set_unknown_str: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.unknown_str = PDB_NOT_QUITE_NULL;
+               sampass->unknown_str = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_UNKNOWNSTR, flag);
@@ -902,21 +936,21 @@ BOOL pdb_set_unknown_str (SAM_ACCOUNT *sampass, const char *unknown_str, enum pd
  Set the user's dial string.
  ********************************************************************/
 
-BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, const char *munged_dial, enum pdb_value_state flag)
+BOOL pdb_set_munged_dial (struct samu *sampass, const char *munged_dial, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (munged_dial) { 
-               sampass->private.munged_dial = talloc_strdup(sampass->mem_ctx, munged_dial);
+               sampass->munged_dial = talloc_strdup(sampass, munged_dial);
                
-               if (!sampass->private.munged_dial) {
+               if (!sampass->munged_dial) {
                        DEBUG(0, ("pdb_set_munged_dial: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.munged_dial = PDB_NOT_QUITE_NULL;
+               sampass->munged_dial = PDB_NOT_QUITE_NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_MUNGEDDIAL, flag);
@@ -926,14 +960,19 @@ BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, const char *munged_dial, enum pd
  Set the user's NT hash.
  ********************************************************************/
 
-BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[NT_HASH_LEN], enum pdb_value_state flag)
+BOOL pdb_set_nt_passwd (struct samu *sampass, const uint8 pwd[NT_HASH_LEN], enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       data_blob_clear_free(&sampass->private.nt_pw);
+       data_blob_clear_free(&sampass->nt_pw);
        
-       sampass->private.nt_pw = data_blob(pwd, NT_HASH_LEN);
+       if (pwd) {
+               sampass->nt_pw =
+                      data_blob_talloc(sampass, pwd, NT_HASH_LEN);
+       } else {
+               sampass->nt_pw = data_blob(NULL, 0);
+       }
 
        return pdb_set_init_flags(sampass, PDB_NTPASSWD, flag);
 }
@@ -942,102 +981,123 @@ BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[NT_HASH_LEN], enum
  Set the user's LM hash.
  ********************************************************************/
 
-BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[LM_HASH_LEN], enum pdb_value_state flag)
+BOOL pdb_set_lanman_passwd (struct samu *sampass, const uint8 pwd[LM_HASH_LEN], enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       data_blob_clear_free(&sampass->private.lm_pw);
+       data_blob_clear_free(&sampass->lm_pw);
        
-       sampass->private.lm_pw = data_blob(pwd, LM_HASH_LEN);
+       if (pwd) {
+               sampass->lm_pw =
+                      data_blob_talloc(sampass, pwd, LM_HASH_LEN);
+       } else {
+               sampass->lm_pw = data_blob(NULL, 0);
+       }
 
        return pdb_set_init_flags(sampass, PDB_LMPASSWD, flag);
 }
 
+/*********************************************************************
+ Set the user's password history hash. historyLen is the number of 
+ PW_HISTORY_SALT_LEN+SALTED_MD5_HASH_LEN length
+ entries to store in the history - this must match the size of the uint8 array
+ in pwd.
+********************************************************************/
+
+BOOL pdb_set_pw_history (struct samu *sampass, const uint8 *pwd, uint32 historyLen, enum pdb_value_state flag)
+{
+       if (!sampass)
+               return False;
+
+       if (historyLen && pwd){
+               sampass->nt_pw_his = data_blob_talloc(sampass,
+                                               pwd, historyLen*PW_HISTORY_ENTRY_LEN);
+               if (!sampass->nt_pw_his.length) {
+                       DEBUG(0, ("pdb_set_pw_history: data_blob_talloc() failed!\n"));
+                       return False;
+               }
+       } else {
+               sampass->nt_pw_his = data_blob_talloc(sampass, NULL, 0);
+       }
+
+       return pdb_set_init_flags(sampass, PDB_PWHISTORY, flag);
+}
+
 /*********************************************************************
  Set the user's plaintext password only (base procedure, see helper
  below)
  ********************************************************************/
 
-BOOL pdb_set_plaintext_pw_only (SAM_ACCOUNT *sampass, const char *password, enum pdb_value_state flag)
+BOOL pdb_set_plaintext_pw_only (struct samu *sampass, const char *password, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (password) { 
-               if (sampass->private.plaintext_pw!=NULL) 
-                       memset(sampass->private.plaintext_pw,'\0',strlen(sampass->private.plaintext_pw)+1);
+               if (sampass->plaintext_pw!=NULL) 
+                       memset(sampass->plaintext_pw,'\0',strlen(sampass->plaintext_pw)+1);
 
-               sampass->private.plaintext_pw = talloc_strdup(sampass->mem_ctx, password);
+               sampass->plaintext_pw = talloc_strdup(sampass, password);
                
-               if (!sampass->private.plaintext_pw) {
+               if (!sampass->plaintext_pw) {
                        DEBUG(0, ("pdb_set_unknown_str: talloc_strdup() failed!\n"));
                        return False;
                }
 
        } else {
-               sampass->private.plaintext_pw = NULL;
+               sampass->plaintext_pw = NULL;
        }
 
        return pdb_set_init_flags(sampass, PDB_PLAINTEXT_PW, flag);
 }
 
-BOOL pdb_set_unknown_3 (SAM_ACCOUNT *sampass, uint32 unkn, enum pdb_value_state flag)
-{
-       if (!sampass)
-               return False;
-
-       sampass->private.unknown_3 = unkn;
-       
-       return pdb_set_init_flags(sampass, PDB_UNKNOWN3, flag);
-}
-
-BOOL pdb_set_bad_password_count(SAM_ACCOUNT *sampass, uint16 bad_password_count, enum pdb_value_state flag)
+BOOL pdb_set_bad_password_count(struct samu *sampass, uint16 bad_password_count, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.bad_password_count = bad_password_count;
+       sampass->bad_password_count = bad_password_count;
 
        return pdb_set_init_flags(sampass, PDB_BAD_PASSWORD_COUNT, flag);
 }
 
-BOOL pdb_set_logon_count(SAM_ACCOUNT *sampass, uint16 logon_count, enum pdb_value_state flag)
+BOOL pdb_set_logon_count(struct samu *sampass, uint16 logon_count, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.logon_count = logon_count;
+       sampass->logon_count = logon_count;
 
        return pdb_set_init_flags(sampass, PDB_LOGON_COUNT, flag);
 }
 
-BOOL pdb_set_unknown_6 (SAM_ACCOUNT *sampass, uint32 unkn, enum pdb_value_state flag)
+BOOL pdb_set_unknown_6 (struct samu *sampass, uint32 unkn, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
-       sampass->private.unknown_6 = unkn;
+       sampass->unknown_6 = unkn;
 
        return pdb_set_init_flags(sampass, PDB_UNKNOWN6, flag);
 }
 
-BOOL pdb_set_hours (SAM_ACCOUNT *sampass, const uint8 *hours, enum pdb_value_state flag)
+BOOL pdb_set_hours (struct samu *sampass, const uint8 *hours, enum pdb_value_state flag)
 {
        if (!sampass)
                return False;
 
        if (!hours) {
-               memset ((char *)sampass->private.hours, 0, MAX_HOURS_LEN);
+               memset ((char *)sampass->hours, 0, MAX_HOURS_LEN);
                return True;
        }
        
-       memcpy (sampass->private.hours, hours, MAX_HOURS_LEN);
+       memcpy (sampass->hours, hours, MAX_HOURS_LEN);
 
        return pdb_set_init_flags(sampass, PDB_HOURS, flag);
 }
 
-BOOL pdb_set_backend_private_data (SAM_ACCOUNT *sampass, void *private_data, 
+BOOL pdb_set_backend_private_data (struct samu *sampass, void *private_data, 
                                   void (*free_fn)(void **), 
                                   const struct pdb_methods *my_methods, 
                                   enum pdb_value_state flag)
@@ -1045,13 +1105,15 @@ BOOL pdb_set_backend_private_data (SAM_ACCOUNT *sampass, void *private_data,
        if (!sampass)
                return False;
 
-       if (sampass->private.backend_private_data && sampass->private.backend_private_data_free_fn) {
-               sampass->private.backend_private_data_free_fn(&sampass->private.backend_private_data);
+       if (sampass->backend_private_data &&
+           sampass->backend_private_data_free_fn) {
+               sampass->backend_private_data_free_fn(
+                       &sampass->backend_private_data);
        }
 
-       sampass->private.backend_private_data = private_data;
-       sampass->private.backend_private_data_free_fn = free_fn;
-       sampass->private.backend_private_methods = my_methods;
+       sampass->backend_private_data = private_data;
+       sampass->backend_private_data_free_fn = free_fn;
+       sampass->backend_private_methods = my_methods;
 
        return pdb_set_init_flags(sampass, PDB_BACKEND_PRIVATE_DATA, flag);
 }
@@ -1064,7 +1126,7 @@ BOOL pdb_set_backend_private_data (SAM_ACCOUNT *sampass, void *private_data,
  password change.
  ********************************************************************/
 
-BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
+BOOL pdb_set_pass_changed_now (struct samu *sampass)
 {
        uint32 expire;
        uint32 min_age;
@@ -1075,8 +1137,8 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
        if (!pdb_set_pass_last_set_time (sampass, time(NULL), PDB_CHANGED))
                return False;
 
-       if (!account_policy_get(AP_MAX_PASSWORD_AGE, &expire) 
-           || (expire==(uint32)-1)) {
+       if (!pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &expire) 
+           || (expire==(uint32)-1) || (expire == 0)) {
                if (!pdb_set_pass_must_change_time (sampass, get_time_t_max(), PDB_CHANGED))
                        return False;
        } else {
@@ -1086,7 +1148,7 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
                        return False;
        }
        
-       if (!account_policy_get(AP_MIN_PASSWORD_AGE, &min_age) 
+       if (!pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &min_age) 
            || (min_age==(uint32)-1)) {
                if (!pdb_set_pass_can_change_time (sampass, 0, PDB_CHANGED))
                        return False;
@@ -1104,21 +1166,32 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
  Also sets the last change time to NOW.
  ********************************************************************/
 
-BOOL pdb_set_plaintext_passwd (SAM_ACCOUNT *sampass, const char *plaintext)
+BOOL pdb_set_plaintext_passwd (struct samu *sampass, const char *plaintext)
 {
-       uchar new_lanman_p16[16];
-       uchar new_nt_p16[16];
+       uchar new_lanman_p16[LM_HASH_LEN];
+       uchar new_nt_p16[NT_HASH_LEN];
 
        if (!sampass || !plaintext)
                return False;
-       
-       nt_lm_owf_gen (plaintext, new_nt_p16, new_lanman_p16);
+
+       /* Calculate the MD4 hash (NT compatible) of the password */
+       E_md4hash(plaintext, new_nt_p16);
 
        if (!pdb_set_nt_passwd (sampass, new_nt_p16, PDB_CHANGED)) 
                return False;
 
-       if (!pdb_set_lanman_passwd (sampass, new_lanman_p16, PDB_CHANGED)) 
-               return False;
+       if (!E_deshash(plaintext, new_lanman_p16)) {
+               /* E_deshash returns false for 'long' passwords (> 14
+                  DOS chars).  This allows us to match Win2k, which
+                  does not store a LM hash for these passwords (which
+                  would reduce the effective password length to 14 */
+
+               if (!pdb_set_lanman_passwd (sampass, NULL, PDB_CHANGED)) 
+                       return False;
+       } else {
+               if (!pdb_set_lanman_passwd (sampass, new_lanman_p16, PDB_CHANGED)) 
+                       return False;
+       }
 
        if (!pdb_set_plaintext_pw_only (sampass, plaintext, PDB_CHANGED)) 
                return False;
@@ -1126,5 +1199,70 @@ BOOL pdb_set_plaintext_passwd (SAM_ACCOUNT *sampass, const char *plaintext)
        if (!pdb_set_pass_changed_now (sampass))
                return False;
 
+       /* Store the password history. */
+       if (pdb_get_acct_ctrl(sampass) & ACB_NORMAL) {
+               uchar *pwhistory;
+               uint32 pwHistLen;
+               pdb_get_account_policy(AP_PASSWORD_HISTORY, &pwHistLen);
+               if (pwHistLen != 0){
+                       uint32 current_history_len;
+                       /* We need to make sure we don't have a race condition here - the
+                          account policy history length can change between when the pw_history
+                          was first loaded into the struct samu struct and now.... JRA. */
+                       pwhistory = (uchar *)pdb_get_pw_history(sampass, &current_history_len);
+
+                       if (current_history_len != pwHistLen) {
+                               /* After closing and reopening struct samu the history
+                                       values will sync up. We can't do this here. */
+
+                               /* current_history_len > pwHistLen is not a problem - we
+                                       have more history than we need. */
+
+                               if (current_history_len < pwHistLen) {
+                                       /* Ensure we have space for the needed history. */
+                                       uchar *new_history = TALLOC(sampass,
+                                                               pwHistLen*PW_HISTORY_ENTRY_LEN);
+                                       /* And copy it into the new buffer. */
+                                       if (current_history_len) {
+                                               memcpy(new_history, pwhistory,
+                                                       current_history_len*PW_HISTORY_ENTRY_LEN);
+                                       }
+                                       /* Clearing out any extra space. */
+                                       memset(&new_history[current_history_len*PW_HISTORY_ENTRY_LEN],
+                                               '\0', (pwHistLen-current_history_len)*PW_HISTORY_ENTRY_LEN);
+                                       /* Finally replace it. */
+                                       pwhistory = new_history;
+                               }
+                       }
+                       if (pwhistory && pwHistLen){
+                               /* Make room for the new password in the history list. */
+                               if (pwHistLen > 1) {
+                                       memmove(&pwhistory[PW_HISTORY_ENTRY_LEN],
+                                               pwhistory, (pwHistLen -1)*PW_HISTORY_ENTRY_LEN );
+                               }
+                               /* Create the new salt as the first part of the history entry. */
+                               generate_random_buffer(pwhistory, PW_HISTORY_SALT_LEN);
+
+                               /* Generate the md5 hash of the salt+new password as the second
+                                       part of the history entry. */
+
+                               E_md5hash(pwhistory, new_nt_p16, &pwhistory[PW_HISTORY_SALT_LEN]);
+                               pdb_set_pw_history(sampass, pwhistory, pwHistLen, PDB_CHANGED);
+                       } else {
+                               DEBUG (10,("pdb_get_set.c: pdb_set_plaintext_passwd: pwhistory was NULL!\n"));
+                       }
+               } else {
+                       /* Set the history length to zero. */
+                       pdb_set_pw_history(sampass, NULL, 0, PDB_CHANGED);
+               }
+       }
+
        return True;
 }
+
+/* check for any PDB_SET/CHANGED field and fill the appropriate mask bit */
+uint32 pdb_build_fields_present (struct samu *sampass)
+{
+       /* value set to all for testing */
+       return 0x00ffffff;
+}