RIP BOOL. Convert BOOL -> bool. I found a few interesting
[tprouty/samba.git] / source3 / passdb / pdb_tdb.c
index c3538042ee19402cae20cf02030912113bc9395c..530660f48ca97b784887cf89aa974c99daadeb28 100644 (file)
@@ -1,15 +1,16 @@
 /*
  * Unix SMB/CIFS implementation. 
  * SMB parameters and setup
- * Copyright (C) Andrew Tridgell 1992-1998
- * Copyright (C) Simo Sorce 2000-2002
- * Copyright (C) Gerald Carter 2000
- * Copyright (C) Jeremy Allison 2001
- * Copyright (C) Andrew Bartlett 2002
+ * Copyright (C) Andrew Tridgell   1992-1998
+ * Copyright (C) Simo Sorce        2000-2003
+ * Copyright (C) Gerald Carter     2000-2006
+ * Copyright (C) Jeremy Allison    2001
+ * Copyright (C) Andrew Bartlett   2002
+ * Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2005
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
@@ -18,8 +19,7 @@
  * more details.
  * 
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 675
- * Mass Ave, Cambridge, MA 02139, USA.
+ * this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
@@ -37,33 +37,38 @@ static int tdbsam_debug_level = DBGC_ALL;
 
 #endif
 
-#define PDB_VERSION            "20010830"
+#define TDBSAM_VERSION 3       /* Most recent TDBSAM version */
+#define TDBSAM_VERSION_STRING  "INFO/version"
 #define PASSDB_FILE_NAME       "passdb.tdb"
-#define TDB_FORMAT_STRING      "ddddddBBBBBBBBBBBBddBBwdwdBdd"
 #define USERPREFIX             "USER_"
 #define RIDPREFIX              "RID_"
+#define PRIVPREFIX             "PRIV_"
 
-struct tdbsam_privates {
-       TDB_CONTEXT     *passwd_tdb;
-       TDB_DATA        key;
-
-       /* retrive-once info */
-       const char *tdbsam_location;
+struct pwent_list {
+       struct pwent_list *prev, *next;
+       TDB_DATA key;
+};
+static struct pwent_list *tdbsam_pwent_list;
+static bool pwent_initialized;
 
-       BOOL permit_non_unix_accounts;
+/* GLOBAL TDB SAM CONTEXT */
 
-       BOOL algorithmic_rids;
-
-       uint32 low_nua_rid; 
-       uint32 high_nua_rid;
-};
+static TDB_CONTEXT *tdbsam;
+static int ref_count = 0;
+static pstring tdbsam_filename;
 
 /**********************************************************************
- Intialize a SAM_ACCOUNT struct from a BYTE buffer of size len
+ Marshall/unmarshall struct samu structs.
  *********************************************************************/
 
-static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
-                                 SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
+#define TDB_FORMAT_STRING_V0       "ddddddBBBBBBBBBBBBddBBwdwdBwwd"
+#define TDB_FORMAT_STRING_V1       "dddddddBBBBBBBBBBBBddBBwdwdBwwd"
+#define TDB_FORMAT_STRING_V2       "dddddddBBBBBBBBBBBBddBBBwwdBwwd"
+
+/*********************************************************************
+*********************************************************************/
+
+static bool init_sam_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 buflen)
 {
 
        /* times are stored as 32bit integer
@@ -75,160 +80,320 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
                pass_last_set_time,
                pass_can_change_time,
                pass_must_change_time;
-       char *username;
-       char *domain;
-       char *nt_username;
-       char *dir_drive;
-       char *unknown_str;
-       char *munged_dial;
-       char *fullname;
-       char *homedir;
-       char *logon_script;
-       char *profile_path;
-       char *acct_desc;
-       char *workstations;
+       char *username = NULL;
+       char *domain = NULL;
+       char *nt_username = NULL;
+       char *dir_drive = NULL;
+       char *unknown_str = NULL;
+       char *munged_dial = NULL;
+       char *fullname = NULL;
+       char *homedir = NULL;
+       char *logon_script = NULL;
+       char *profile_path = NULL;
+       char *acct_desc = NULL;
+       char *workstations = NULL;
        uint32  username_len, domain_len, nt_username_len,
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
                
-       uint32  user_rid, group_rid, unknown_3, hours_len, unknown_5, unknown_6;
+       uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
        uint16  acct_ctrl, logon_divs;
-       uint8   *hours;
-       static uint8    *lm_pw_ptr, *nt_pw_ptr;
+       uint16  bad_password_count, logon_count;
+       uint8   *hours = NULL;
+       uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
        uint32          len = 0;
        uint32          lm_pw_len, nt_pw_len, hourslen;
-       BOOL ret = True;
-       struct passwd *pw;
-       uid_t uid = -1;
-       gid_t gid = -1; /* This is what standard sub advanced expects if no gid is known */
+       bool ret = True;
        
        if(sampass == NULL || buf == NULL) {
-               DEBUG(0, ("init_sam_from_buffer: NULL parameters found!\n"));
+               DEBUG(0, ("init_sam_from_buffer_v0: NULL parameters found!\n"));
                return False;
        }
-                                                                       
+
+/* TDB_FORMAT_STRING_V0       "ddddddBBBBBBBBBBBBddBBwdwdBwwd" */
+
        /* unpack the buffer into variables */
-       len = tdb_unpack (buf, buflen, TDB_FORMAT_STRING,
-               &logon_time,
-               &logoff_time,
-               &kickoff_time,
-               &pass_last_set_time,
-               &pass_can_change_time,
-               &pass_must_change_time,
-               &username_len, &username,
-               &domain_len, &domain,
-               &nt_username_len, &nt_username,
-               &fullname_len, &fullname,
-               &homedir_len, &homedir,
-               &dir_drive_len, &dir_drive,
-               &logon_script_len, &logon_script,
-               &profile_path_len, &profile_path,
-               &acct_desc_len, &acct_desc,
-               &workstations_len, &workstations,
-               &unknown_str_len, &unknown_str,
-               &munged_dial_len, &munged_dial,
-               &user_rid,
-               &group_rid,
-               &lm_pw_len, &lm_pw_ptr,
-               &nt_pw_len, &nt_pw_ptr,
-               &acct_ctrl,
-               &unknown_3,
-               &logon_divs,
-               &hours_len,
-               &hourslen, &hours,
-               &unknown_5,
-               &unknown_6);
+       len = tdb_unpack (buf, buflen, TDB_FORMAT_STRING_V0,
+               &logon_time,                                            /* d */
+               &logoff_time,                                           /* d */
+               &kickoff_time,                                          /* d */
+               &pass_last_set_time,                                    /* d */
+               &pass_can_change_time,                                  /* d */
+               &pass_must_change_time,                                 /* d */
+               &username_len, &username,                               /* B */
+               &domain_len, &domain,                                   /* B */
+               &nt_username_len, &nt_username,                         /* B */
+               &fullname_len, &fullname,                               /* B */
+               &homedir_len, &homedir,                                 /* B */
+               &dir_drive_len, &dir_drive,                             /* B */
+               &logon_script_len, &logon_script,                       /* B */
+               &profile_path_len, &profile_path,                       /* B */
+               &acct_desc_len, &acct_desc,                             /* B */
+               &workstations_len, &workstations,                       /* B */
+               &unknown_str_len, &unknown_str,                         /* B */
+               &munged_dial_len, &munged_dial,                         /* B */
+               &user_rid,                                              /* d */
+               &group_rid,                                             /* d */
+               &lm_pw_len, &lm_pw_ptr,                                 /* B */
+               &nt_pw_len, &nt_pw_ptr,                                 /* B */
+               &acct_ctrl,                                             /* w */
+               &remove_me, /* remove on the next TDB_FORMAT upgarde */ /* d */
+               &logon_divs,                                            /* w */
+               &hours_len,                                             /* d */
+               &hourslen, &hours,                                      /* B */
+               &bad_password_count,                                    /* w */
+               &logon_count,                                           /* w */
+               &unknown_6);                                            /* d */
                
-       if (len == -1)  {
+       if (len == (uint32) -1)  {
                ret = False;
                goto done;
        }
 
-       /* validate the account and fill in UNIX uid and gid. Standard
-        * getpwnam() is used instead of Get_Pwnam() as we do not need
-        * to try case permutations
-        */
-       if (!username || !(pw = getpwnam_alloc(username))) {
-               if (!(tdb_state->permit_non_unix_accounts)) {
-                       DEBUG(0,("tdbsam: getpwnam_alloc(%s) return NULL.  User does not exist!\n", username));
+       pdb_set_logon_time(sampass, logon_time, PDB_SET);
+       pdb_set_logoff_time(sampass, logoff_time, PDB_SET);
+       pdb_set_kickoff_time(sampass, kickoff_time, PDB_SET);
+       pdb_set_pass_can_change_time(sampass, pass_can_change_time, PDB_SET);
+       pdb_set_pass_must_change_time(sampass, pass_must_change_time, PDB_SET);
+       pdb_set_pass_last_set_time(sampass, pass_last_set_time, PDB_SET);
+
+       pdb_set_username(sampass, username, PDB_SET); 
+       pdb_set_domain(sampass, domain, PDB_SET);
+       pdb_set_nt_username(sampass, nt_username, PDB_SET);
+       pdb_set_fullname(sampass, fullname, PDB_SET);
+
+       if (homedir) {
+               pdb_set_homedir(sampass, homedir, PDB_SET);
+       }
+       else {
+               pdb_set_homedir(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_home()),
+                       PDB_DEFAULT);
+       }
+
+       if (dir_drive)  
+               pdb_set_dir_drive(sampass, dir_drive, PDB_SET);
+       else {
+               pdb_set_dir_drive(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_drive()),
+                       PDB_DEFAULT);
+       }
+
+       if (logon_script) 
+               pdb_set_logon_script(sampass, logon_script, PDB_SET);
+       else {
+               pdb_set_logon_script(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_script()),
+                       PDB_DEFAULT);
+       }
+       
+       if (profile_path) {     
+               pdb_set_profile_path(sampass, profile_path, PDB_SET);
+       } else {
+               pdb_set_profile_path(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_path()),
+                       PDB_DEFAULT);
+       }
+
+       pdb_set_acct_desc(sampass, acct_desc, PDB_SET);
+       pdb_set_workstations(sampass, workstations, PDB_SET);
+       pdb_set_munged_dial(sampass, munged_dial, PDB_SET);
+
+       if (lm_pw_ptr && lm_pw_len == LM_HASH_LEN) {
+               if (!pdb_set_lanman_passwd(sampass, lm_pw_ptr, PDB_SET)) {
                        ret = False;
                        goto done;
                }
        }
+
+       if (nt_pw_ptr && nt_pw_len == NT_HASH_LEN) {
+               if (!pdb_set_nt_passwd(sampass, nt_pw_ptr, PDB_SET)) {
+                       ret = False;
+                       goto done;
+               }
+       }
+
+       pdb_set_pw_history(sampass, NULL, 0, PDB_SET);
+       pdb_set_user_sid_from_rid(sampass, user_rid, PDB_SET);
+       pdb_set_group_sid_from_rid(sampass, group_rid, PDB_SET);
+       pdb_set_hours_len(sampass, hours_len, PDB_SET);
+       pdb_set_bad_password_count(sampass, bad_password_count, PDB_SET);
+       pdb_set_logon_count(sampass, logon_count, PDB_SET);
+       pdb_set_unknown_6(sampass, unknown_6, PDB_SET);
+       pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
+       pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
+       pdb_set_hours(sampass, hours, PDB_SET);
+
+done:
+
+       SAFE_FREE(username);
+       SAFE_FREE(domain);
+       SAFE_FREE(nt_username);
+       SAFE_FREE(fullname);
+       SAFE_FREE(homedir);
+       SAFE_FREE(dir_drive);
+       SAFE_FREE(logon_script);
+       SAFE_FREE(profile_path);
+       SAFE_FREE(acct_desc);
+       SAFE_FREE(workstations);
+       SAFE_FREE(munged_dial);
+       SAFE_FREE(unknown_str);
+       SAFE_FREE(lm_pw_ptr);
+       SAFE_FREE(nt_pw_ptr);
+       SAFE_FREE(hours);
+
+       return ret;
+}
+
+/*********************************************************************
+*********************************************************************/
+
+static bool init_sam_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 buflen)
+{
+
+       /* times are stored as 32bit integer
+          take care on system with 64bit wide time_t
+          --SSS */
+       uint32  logon_time,
+               logoff_time,
+               kickoff_time,
+               bad_password_time,
+               pass_last_set_time,
+               pass_can_change_time,
+               pass_must_change_time;
+       char *username = NULL;
+       char *domain = NULL;
+       char *nt_username = NULL;
+       char *dir_drive = NULL;
+       char *unknown_str = NULL;
+       char *munged_dial = NULL;
+       char *fullname = NULL;
+       char *homedir = NULL;
+       char *logon_script = NULL;
+       char *profile_path = NULL;
+       char *acct_desc = NULL;
+       char *workstations = NULL;
+       uint32  username_len, domain_len, nt_username_len,
+               dir_drive_len, unknown_str_len, munged_dial_len,
+               fullname_len, homedir_len, logon_script_len,
+               profile_path_len, acct_desc_len, workstations_len;
                
-       if (pw) {
-               uid = pw->pw_uid;
-               gid = pw->pw_gid;
-               
-               pdb_set_unix_homedir(sampass, pw->pw_dir, PDB_SET);
+       uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
+       uint16  acct_ctrl, logon_divs;
+       uint16  bad_password_count, logon_count;
+       uint8   *hours = NULL;
+       uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
+       uint32          len = 0;
+       uint32          lm_pw_len, nt_pw_len, hourslen;
+       bool ret = True;
+       
+       if(sampass == NULL || buf == NULL) {
+               DEBUG(0, ("init_sam_from_buffer_v1: NULL parameters found!\n"));
+               return False;
+       }
 
-               passwd_free(&pw);
+/* TDB_FORMAT_STRING_V1       "dddddddBBBBBBBBBBBBddBBwdwdBwwd" */
 
-               pdb_set_uid(sampass, uid, PDB_SET);
-               pdb_set_gid(sampass, gid, PDB_SET);
+       /* unpack the buffer into variables */
+       len = tdb_unpack (buf, buflen, TDB_FORMAT_STRING_V1,
+               &logon_time,                                            /* d */
+               &logoff_time,                                           /* d */
+               &kickoff_time,                                          /* d */
+               /* Change from V0 is addition of bad_password_time field. */
+               &bad_password_time,                                     /* d */
+               &pass_last_set_time,                                    /* d */
+               &pass_can_change_time,                                  /* d */
+               &pass_must_change_time,                                 /* d */
+               &username_len, &username,                               /* B */
+               &domain_len, &domain,                                   /* B */
+               &nt_username_len, &nt_username,                         /* B */
+               &fullname_len, &fullname,                               /* B */
+               &homedir_len, &homedir,                                 /* B */
+               &dir_drive_len, &dir_drive,                             /* B */
+               &logon_script_len, &logon_script,                       /* B */
+               &profile_path_len, &profile_path,                       /* B */
+               &acct_desc_len, &acct_desc,                             /* B */
+               &workstations_len, &workstations,                       /* B */
+               &unknown_str_len, &unknown_str,                         /* B */
+               &munged_dial_len, &munged_dial,                         /* B */
+               &user_rid,                                              /* d */
+               &group_rid,                                             /* d */
+               &lm_pw_len, &lm_pw_ptr,                                 /* B */
+               &nt_pw_len, &nt_pw_ptr,                                 /* B */
+               &acct_ctrl,                                             /* w */
+               &remove_me,                                             /* d */
+               &logon_divs,                                            /* w */
+               &hours_len,                                             /* d */
+               &hourslen, &hours,                                      /* B */
+               &bad_password_count,                                    /* w */
+               &logon_count,                                           /* w */
+               &unknown_6);                                            /* d */
+               
+       if (len == (uint32) -1)  {
+               ret = False;
+               goto done;
        }
 
        pdb_set_logon_time(sampass, logon_time, PDB_SET);
        pdb_set_logoff_time(sampass, logoff_time, PDB_SET);
        pdb_set_kickoff_time(sampass, kickoff_time, PDB_SET);
+
+       /* Change from V0 is addition of bad_password_time field. */
+       pdb_set_bad_password_time(sampass, bad_password_time, PDB_SET);
        pdb_set_pass_can_change_time(sampass, pass_can_change_time, PDB_SET);
        pdb_set_pass_must_change_time(sampass, pass_must_change_time, PDB_SET);
        pdb_set_pass_last_set_time(sampass, pass_last_set_time, PDB_SET);
 
-       pdb_set_username     (sampass, username, PDB_SET); 
-       pdb_set_domain       (sampass, domain, PDB_SET);
-       pdb_set_nt_username  (sampass, nt_username, PDB_SET);
-       pdb_set_fullname     (sampass, fullname, PDB_SET);
+       pdb_set_username(sampass, username, PDB_SET); 
+       pdb_set_domain(sampass, domain, PDB_SET);
+       pdb_set_nt_username(sampass, nt_username, PDB_SET);
+       pdb_set_fullname(sampass, fullname, PDB_SET);
 
        if (homedir) {
                pdb_set_homedir(sampass, homedir, PDB_SET);
        }
        else {
                pdb_set_homedir(sampass, 
-                               talloc_sub_specified(sampass->mem_ctx, 
-                                                      lp_logon_home(),
-                                                      username, domain, 
-                                                      uid, gid),
-                               PDB_DEFAULT);
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_home()),
+                       PDB_DEFAULT);
        }
 
        if (dir_drive)  
                pdb_set_dir_drive(sampass, dir_drive, PDB_SET);
        else {
                pdb_set_dir_drive(sampass, 
-                                 talloc_sub_specified(sampass->mem_ctx, 
-                                                        lp_logon_drive(),
-                                                        username, domain, 
-                                                        uid, gid),
-                                 PDB_DEFAULT);
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_drive()),
+                       PDB_DEFAULT);
        }
 
        if (logon_script) 
                pdb_set_logon_script(sampass, logon_script, PDB_SET);
        else {
                pdb_set_logon_script(sampass, 
-                                    talloc_sub_specified(sampass->mem_ctx, 
-                                                           lp_logon_script(),
-                                                           username, domain, 
-                                                           uid, gid),
-                                 PDB_DEFAULT);
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_script()),
+                       PDB_DEFAULT);
        }
        
        if (profile_path) {     
                pdb_set_profile_path(sampass, profile_path, PDB_SET);
        } else {
                pdb_set_profile_path(sampass, 
-                                    talloc_sub_specified(sampass->mem_ctx, 
-                                                           lp_logon_path(),
-                                                           username, domain, 
-                                                           uid, gid),
-                                    PDB_DEFAULT);
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_path()),
+                       PDB_DEFAULT);
        }
 
-       pdb_set_acct_desc    (sampass, acct_desc, PDB_SET);
-       pdb_set_workstations (sampass, workstations, PDB_SET);
-       pdb_set_munged_dial  (sampass, munged_dial, PDB_SET);
+       pdb_set_acct_desc(sampass, acct_desc, PDB_SET);
+       pdb_set_workstations(sampass, workstations, PDB_SET);
+       pdb_set_munged_dial(sampass, munged_dial, PDB_SET);
 
        if (lm_pw_ptr && lm_pw_len == LM_HASH_LEN) {
                if (!pdb_set_lanman_passwd(sampass, lm_pw_ptr, PDB_SET)) {
@@ -244,11 +409,13 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
                }
        }
 
+       pdb_set_pw_history(sampass, NULL, 0, PDB_SET);
+
        pdb_set_user_sid_from_rid(sampass, user_rid, PDB_SET);
        pdb_set_group_sid_from_rid(sampass, group_rid, PDB_SET);
-       pdb_set_unknown_3(sampass, unknown_3, PDB_SET);
        pdb_set_hours_len(sampass, hours_len, PDB_SET);
-       pdb_set_unknown_5(sampass, unknown_5, PDB_SET);
+       pdb_set_bad_password_count(sampass, bad_password_count, PDB_SET);
+       pdb_set_logon_count(sampass, logon_count, PDB_SET);
        pdb_set_unknown_6(sampass, unknown_6, PDB_SET);
        pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
        pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
@@ -267,17 +434,16 @@ done:
        SAFE_FREE(acct_desc);
        SAFE_FREE(workstations);
        SAFE_FREE(munged_dial);
+       SAFE_FREE(unknown_str);
+       SAFE_FREE(lm_pw_ptr);
+       SAFE_FREE(nt_pw_ptr);
+       SAFE_FREE(hours);
 
        return ret;
 }
 
-/**********************************************************************
- Intialize a BYTE buffer from a SAM_ACCOUNT struct
- *********************************************************************/
-static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state,
-                                   uint8 **buf, const SAM_ACCOUNT *sampass)
+bool init_sam_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 buflen)
 {
-       size_t          len, buflen;
 
        /* times are stored as 32bit integer
           take care on system with 64bit wide time_t
@@ -285,284 +451,570 @@ static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state,
        uint32  logon_time,
                logoff_time,
                kickoff_time,
+               bad_password_time,
                pass_last_set_time,
                pass_can_change_time,
                pass_must_change_time;
-
-       uint32  user_rid, group_rid;
-
-       const char *username;
-       const char *domain;
-       const char *nt_username;
-       const char *dir_drive;
-       const char *unknown_str;
-       const char *munged_dial;
-       const char *fullname;
-       const char *homedir;
-       const char *logon_script;
-       const char *profile_path;
-       const char *acct_desc;
-       const char *workstations;
+       char *username = NULL;
+       char *domain = NULL;
+       char *nt_username = NULL;
+       char *dir_drive = NULL;
+       char *unknown_str = NULL;
+       char *munged_dial = NULL;
+       char *fullname = NULL;
+       char *homedir = NULL;
+       char *logon_script = NULL;
+       char *profile_path = NULL;
+       char *acct_desc = NULL;
+       char *workstations = NULL;
        uint32  username_len, domain_len, nt_username_len,
                dir_drive_len, unknown_str_len, munged_dial_len,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
+               
+       uint32  user_rid, group_rid, hours_len, unknown_6;
+       uint16  acct_ctrl, logon_divs;
+       uint16  bad_password_count, logon_count;
+       uint8   *hours = NULL;
+       uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL, *nt_pw_hist_ptr = NULL;
+       uint32          len = 0;
+       uint32          lm_pw_len, nt_pw_len, nt_pw_hist_len, hourslen;
+       uint32 pwHistLen = 0;
+       bool ret = True;
+       fstring tmpstring;
+       bool expand_explicit = lp_passdb_expand_explicit();
+       
+       if(sampass == NULL || buf == NULL) {
+               DEBUG(0, ("init_sam_from_buffer_v2: NULL parameters found!\n"));
+               return False;
+       }
+                                                                       
+/* TDB_FORMAT_STRING_V2       "dddddddBBBBBBBBBBBBddBBBwwdBwwd" */
+
+       /* unpack the buffer into variables */
+       len = tdb_unpack (buf, buflen, TDB_FORMAT_STRING_V2,
+               &logon_time,                                            /* d */
+               &logoff_time,                                           /* d */
+               &kickoff_time,                                          /* d */
+               &bad_password_time,                                     /* d */
+               &pass_last_set_time,                                    /* d */
+               &pass_can_change_time,                                  /* d */
+               &pass_must_change_time,                                 /* d */
+               &username_len, &username,                               /* B */
+               &domain_len, &domain,                                   /* B */
+               &nt_username_len, &nt_username,                         /* B */
+               &fullname_len, &fullname,                               /* B */
+               &homedir_len, &homedir,                                 /* B */
+               &dir_drive_len, &dir_drive,                             /* B */
+               &logon_script_len, &logon_script,                       /* B */
+               &profile_path_len, &profile_path,                       /* B */
+               &acct_desc_len, &acct_desc,                             /* B */
+               &workstations_len, &workstations,                       /* B */
+               &unknown_str_len, &unknown_str,                         /* B */
+               &munged_dial_len, &munged_dial,                         /* B */
+               &user_rid,                                              /* d */
+               &group_rid,                                             /* d */
+               &lm_pw_len, &lm_pw_ptr,                                 /* B */
+               &nt_pw_len, &nt_pw_ptr,                                 /* B */
+               /* Change from V1 is addition of password history field. */
+               &nt_pw_hist_len, &nt_pw_hist_ptr,                       /* B */
+               &acct_ctrl,                                             /* w */
+               /* Also "remove_me" field was removed. */
+               &logon_divs,                                            /* w */
+               &hours_len,                                             /* d */
+               &hourslen, &hours,                                      /* B */
+               &bad_password_count,                                    /* w */
+               &logon_count,                                           /* w */
+               &unknown_6);                                            /* d */
+               
+       if (len == (uint32) -1)  {
+               ret = False;
+               goto done;
+       }
+
+       pdb_set_logon_time(sampass, logon_time, PDB_SET);
+       pdb_set_logoff_time(sampass, logoff_time, PDB_SET);
+       pdb_set_kickoff_time(sampass, kickoff_time, PDB_SET);
+       pdb_set_bad_password_time(sampass, bad_password_time, PDB_SET);
+       pdb_set_pass_can_change_time(sampass, pass_can_change_time, PDB_SET);
+       pdb_set_pass_must_change_time(sampass, pass_must_change_time, PDB_SET);
+       pdb_set_pass_last_set_time(sampass, pass_last_set_time, PDB_SET);
+
+       pdb_set_username(sampass, username, PDB_SET); 
+       pdb_set_domain(sampass, domain, PDB_SET);
+       pdb_set_nt_username(sampass, nt_username, PDB_SET);
+       pdb_set_fullname(sampass, fullname, PDB_SET);
+
+       if (homedir) {
+               fstrcpy( tmpstring, homedir );
+               if (expand_explicit) {
+                       standard_sub_basic( username, domain, tmpstring,
+                                           sizeof(tmpstring) );
+               }
+               pdb_set_homedir(sampass, tmpstring, PDB_SET);
+       }
+       else {
+               pdb_set_homedir(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_home()),
+                       PDB_DEFAULT);
+       }
 
-       const uint8 *lm_pw;
-       const uint8 *nt_pw;
-       uint32  lm_pw_len = 16;
-       uint32  nt_pw_len = 16;
+       if (dir_drive)  
+               pdb_set_dir_drive(sampass, dir_drive, PDB_SET);
+       else
+               pdb_set_dir_drive(sampass, lp_logon_drive(), PDB_DEFAULT );
 
-       /* do we have a valid SAM_ACCOUNT pointer? */
-       if (sampass == NULL) {
-               DEBUG(0, ("init_buffer_from_sam: SAM_ACCOUNT is NULL!\n"));
-               return -1;
+       if (logon_script) {
+               fstrcpy( tmpstring, logon_script );
+               if (expand_explicit) {
+                       standard_sub_basic( username, domain, tmpstring,
+                                           sizeof(tmpstring) );
+               }
+               pdb_set_logon_script(sampass, tmpstring, PDB_SET);
+       }
+       else {
+               pdb_set_logon_script(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_script()),
+                       PDB_DEFAULT);
        }
        
-       *buf = NULL;
-       buflen = 0;
+       if (profile_path) {     
+               fstrcpy( tmpstring, profile_path );
+               if (expand_explicit) {
+                       standard_sub_basic( username, domain, tmpstring,
+                                           sizeof(tmpstring) );
+               }
+               pdb_set_profile_path(sampass, tmpstring, PDB_SET);
+       } 
+       else {
+               pdb_set_profile_path(sampass, 
+                       talloc_sub_basic(sampass, username, domain,
+                                        lp_logon_path()),
+                       PDB_DEFAULT);
+       }
 
-       logon_time = (uint32)pdb_get_logon_time(sampass);
-       logoff_time = (uint32)pdb_get_logoff_time(sampass);
-       kickoff_time = (uint32)pdb_get_kickoff_time(sampass);
-       pass_can_change_time = (uint32)pdb_get_pass_can_change_time(sampass);
-       pass_must_change_time = (uint32)pdb_get_pass_must_change_time(sampass);
-       pass_last_set_time = (uint32)pdb_get_pass_last_set_time(sampass);
+       pdb_set_acct_desc(sampass, acct_desc, PDB_SET);
+       pdb_set_workstations(sampass, workstations, PDB_SET);
+       pdb_set_munged_dial(sampass, munged_dial, PDB_SET);
 
-       user_rid = pdb_get_user_rid(sampass);
-       group_rid = pdb_get_group_rid(sampass);
+       if (lm_pw_ptr && lm_pw_len == LM_HASH_LEN) {
+               if (!pdb_set_lanman_passwd(sampass, lm_pw_ptr, PDB_SET)) {
+                       ret = False;
+                       goto done;
+               }
+       }
+
+       if (nt_pw_ptr && nt_pw_len == NT_HASH_LEN) {
+               if (!pdb_set_nt_passwd(sampass, nt_pw_ptr, PDB_SET)) {
+                       ret = False;
+                       goto done;
+               }
+       }
+
+       /* Change from V1 is addition of password history field. */
+       pdb_get_account_policy(AP_PASSWORD_HISTORY, &pwHistLen);
+       if (pwHistLen) {
+               uint8 *pw_hist = SMB_MALLOC_ARRAY(uint8, pwHistLen * PW_HISTORY_ENTRY_LEN);
+               if (!pw_hist) {
+                       ret = False;
+                       goto done;
+               }
+               memset(pw_hist, '\0', pwHistLen * PW_HISTORY_ENTRY_LEN);
+               if (nt_pw_hist_ptr && nt_pw_hist_len) {
+                       int i;
+                       SMB_ASSERT((nt_pw_hist_len % PW_HISTORY_ENTRY_LEN) == 0);
+                       nt_pw_hist_len /= PW_HISTORY_ENTRY_LEN;
+                       for (i = 0; (i < pwHistLen) && (i < nt_pw_hist_len); i++) {
+                               memcpy(&pw_hist[i*PW_HISTORY_ENTRY_LEN],
+                                       &nt_pw_hist_ptr[i*PW_HISTORY_ENTRY_LEN],
+                                       PW_HISTORY_ENTRY_LEN);
+                       }
+               }
+               if (!pdb_set_pw_history(sampass, pw_hist, pwHistLen, PDB_SET)) {
+                       SAFE_FREE(pw_hist);
+                       ret = False;
+                       goto done;
+               }
+               SAFE_FREE(pw_hist);
+       } else {
+               pdb_set_pw_history(sampass, NULL, 0, PDB_SET);
+       }
+
+       pdb_set_user_sid_from_rid(sampass, user_rid, PDB_SET);
+       pdb_set_group_sid_from_rid(sampass, group_rid, PDB_SET);
+       pdb_set_hours_len(sampass, hours_len, PDB_SET);
+       pdb_set_bad_password_count(sampass, bad_password_count, PDB_SET);
+       pdb_set_logon_count(sampass, logon_count, PDB_SET);
+       pdb_set_unknown_6(sampass, unknown_6, PDB_SET);
+       pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
+       pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
+       pdb_set_hours(sampass, hours, PDB_SET);
+
+done:
+
+       SAFE_FREE(username);
+       SAFE_FREE(domain);
+       SAFE_FREE(nt_username);
+       SAFE_FREE(fullname);
+       SAFE_FREE(homedir);
+       SAFE_FREE(dir_drive);
+       SAFE_FREE(logon_script);
+       SAFE_FREE(profile_path);
+       SAFE_FREE(acct_desc);
+       SAFE_FREE(workstations);
+       SAFE_FREE(munged_dial);
+       SAFE_FREE(unknown_str);
+       SAFE_FREE(lm_pw_ptr);
+       SAFE_FREE(nt_pw_ptr);
+       SAFE_FREE(nt_pw_hist_ptr);
+       SAFE_FREE(hours);
 
-       username = pdb_get_username(sampass);
-       if (username) username_len = strlen(username) +1;
-       else username_len = 0;
+       return ret;
+}
 
-       domain = pdb_get_domain(sampass);
-       if (domain) domain_len = strlen(domain) +1;
-       else domain_len = 0;
 
-       nt_username = pdb_get_nt_username(sampass);
-       if (nt_username) nt_username_len = strlen(nt_username) +1;
-       else nt_username_len = 0;
+/**********************************************************************
+ Intialize a struct samu struct from a BYTE buffer of size len
+ *********************************************************************/
 
-       fullname = pdb_get_fullname(sampass);
-       if (fullname) fullname_len = strlen(fullname) +1;
-       else fullname_len = 0;
+static bool init_sam_from_buffer(struct samu *sampass, uint8 *buf, uint32 buflen)
+{
+       return init_sam_from_buffer_v3(sampass, buf, buflen);
+}
 
-       /*
-        * Only updates fields which have been set (not defaults from smb.conf)
       */
+/**********************************************************************
+ Intialize a BYTE buffer from a struct samu struct
*********************************************************************/
 
-       if (!IS_SAM_DEFAULT(sampass, PDB_DRIVE)) 
-         dir_drive = pdb_get_dir_drive(sampass);
-       else dir_drive = NULL;
-       if (dir_drive) dir_drive_len = strlen(dir_drive) +1;
-       else dir_drive_len = 0;
+static uint32 init_buffer_from_sam (uint8 **buf, struct samu *sampass, bool size_only)
+{
+       return init_buffer_from_sam_v3(buf, sampass, size_only);
+}
+
+/**********************************************************************
+ Intialize a BYTE buffer from a struct samu struct
+ *********************************************************************/
 
-       if (!IS_SAM_DEFAULT(sampass, PDB_SMBHOME)) homedir = pdb_get_homedir(sampass);
-       else homedir = NULL;
-       if (homedir) homedir_len = strlen(homedir) +1;
-       else homedir_len = 0;
+static bool tdbsam_convert(int32 from) 
+{
+       const char      *vstring = TDBSAM_VERSION_STRING;
+       const char      *prefix = USERPREFIX;
+       TDB_DATA        data, key, old_key;
+       uint8           *buf = NULL;
+       bool            ret;
 
-       if (!IS_SAM_DEFAULT(sampass, PDB_LOGONSCRIPT)) logon_script = pdb_get_logon_script(sampass);
-       else logon_script = NULL;
-       if (logon_script) logon_script_len = strlen(logon_script) +1;
-       else logon_script_len = 0;
+       /* handle a Samba upgrade */
+       tdb_lock_bystring(tdbsam, vstring);
+       
+       /* Enumerate all records and convert them */
+       key = tdb_firstkey(tdbsam);
 
-       if (!IS_SAM_DEFAULT(sampass, PDB_PROFILE)) profile_path = pdb_get_profile_path(sampass);
-       else profile_path = NULL;
-       if (profile_path) profile_path_len = strlen(profile_path) +1;
-       else profile_path_len = 0;
+       while (key.dptr) {
+       
+               /* skip all non-USER entries (eg. RIDs) */
+               while ((key.dsize != 0) && (strncmp((const char *)key.dptr, prefix, strlen (prefix)))) {
+                       old_key = key;
+                       /* increment to next in line */
+                       key = tdb_nextkey(tdbsam, key);
+                       SAFE_FREE(old_key.dptr);
+               }
        
-       lm_pw = pdb_get_lanman_passwd(sampass);
-       if (!lm_pw) lm_pw_len = 0;
+               if (key.dptr) {
+                       struct samu *user = NULL;
+
+                       /* read from tdbsam */
+                       data = tdb_fetch(tdbsam, key);
+                       if (!data.dptr) {
+                               DEBUG(0,("tdbsam_convert: database entry not found: %s.\n",key.dptr));
+                               return False;
+                       }
        
-       nt_pw = pdb_get_nt_passwd(sampass);
-       if (!nt_pw) nt_pw_len = 0;
+                       /* unpack the buffer from the former format */
+                       if ( !(user = samu_new( NULL )) ) {
+                               DEBUG(0,("tdbsam_convert: samu_new() failed!\n"));
+                               SAFE_FREE( data.dptr );
+                               return False;
+                       }
+                       DEBUG(10,("tdbsam_convert: Try unpacking a record with (key:%s) (version:%d)\n", key.dptr, from));
+                       switch (from) {
+                               case 0:
+                                       ret = init_sam_from_buffer_v0(user, (uint8 *)data.dptr, data.dsize);
+                                       break;
+                               case 1:
+                                       ret = init_sam_from_buffer_v1(user, (uint8 *)data.dptr, data.dsize);
+                                       break;
+                               case 2:
+                                       ret = init_sam_from_buffer_v2(user, (uint8 *)data.dptr, data.dsize);
+                                       break;
+                               case 3:
+                                       ret = init_sam_from_buffer_v3(user, (uint8 *)data.dptr, data.dsize);
+                                       break;
+                               default:
+                                       /* unknown tdbsam version */
+                                       ret = False;
+                       }
+                       if (!ret) {
+                               DEBUG(0,("tdbsam_convert: Bad struct samu entry returned from TDB (key:%s) (version:%d)\n", key.dptr, from));
+                               SAFE_FREE(data.dptr);
+                               TALLOC_FREE(user );
+                               return False;
+                       }
+       
+                       /* We're finished with the old data. */
+                       SAFE_FREE(data.dptr);
+
+                       /* pack from the buffer into the new format */
+                       
+                       DEBUG(10,("tdbsam_convert: Try packing a record (key:%s) (version:%d)\n",
+                                 (const char *)key.dptr, from));
+                       data.dsize = init_buffer_from_sam (&buf, user, False);
+                       TALLOC_FREE(user );
+                       
+                       if ( data.dsize == -1 ) {
+                               DEBUG(0,("tdbsam_convert: cannot pack the struct samu into the new format\n"));
+                               return False;
+                       }
+                       data.dptr = buf;
+                       
+                       /* Store the buffer inside the TDBSAM */
+                       if (tdb_store(tdbsam, key, data, TDB_MODIFY) != TDB_SUCCESS) {
+                               DEBUG(0,("tdbsam_convert: cannot store the struct samu (key:%s) in new format\n",key.dptr));
+                               SAFE_FREE(data.dptr);
+                               return False;
+                       }
+                       
+                       SAFE_FREE(data.dptr);
+                       
+                       /* increment to next in line */
+                       old_key = key;
+                       key = tdb_nextkey(tdbsam, key);
+                       SAFE_FREE(old_key.dptr);
+               }
                
-       acct_desc = pdb_get_acct_desc(sampass);
-       if (acct_desc) acct_desc_len = strlen(acct_desc) +1;
-       else acct_desc_len = 0;
+       }
+
+       
+       /* upgrade finished */
+       tdb_store_int32(tdbsam, vstring, TDBSAM_VERSION);
+       tdb_unlock_bystring(tdbsam, vstring);
+
+       return(True);   
+}
 
-       workstations = pdb_get_workstations(sampass);
-       if (workstations) workstations_len = strlen(workstations) +1;
-       else workstations_len = 0;
+/*********************************************************************
+ Open the tdbsam file based on the absolute path specified.
+ Uses a reference count to allow multiple open calls.
+*********************************************************************/
 
-       unknown_str = NULL;
-       unknown_str_len = 0;
+static bool tdbsam_open( const char *name )
+{
+       int32   version;
+       
+       /* check if we are already open */
+       
+       if ( tdbsam ) {
+               ref_count++;
+               DEBUG(8,("tdbsam_open: Incrementing open reference count.  Ref count is now %d\n", 
+                       ref_count));
+               return True;
+       }
+       
+       SMB_ASSERT( ref_count == 0 );
+       
+       /* Try to open tdb passwd.  Create a new one if necessary */
+       
+       if (!(tdbsam = tdb_open_log(name, 0, TDB_DEFAULT, O_CREAT|O_RDWR, 0600))) {
+               DEBUG(0, ("tdbsam_open: Failed to open/create TDB passwd [%s]\n", name));
+               return False;
+       }
 
-       munged_dial = pdb_get_munged_dial(sampass);
-       if (munged_dial) munged_dial_len = strlen(munged_dial) +1;
-       else munged_dial_len = 0;       
+       /* set the initial reference count - must be done before tdbsam_convert
+          as that calls tdbsam_open()/tdbsam_close(). */
+
+       ref_count = 1;
+
+       /* Check the version */
+       version = tdb_fetch_int32( tdbsam, TDBSAM_VERSION_STRING );
+       
+       if (version == -1) {
+               version = 0;    /* Version not found, assume version 0 */
+       }
+       
+       /* Compare the version */
+       if (version > TDBSAM_VERSION) {
+               /* Version more recent than the latest known */ 
+               DEBUG(0, ("tdbsam_open: unknown version => %d\n", version));
+               tdb_close( tdbsam );
+               ref_count = 0;
+               return False;
+       } 
+       
+       
+       if ( version < TDBSAM_VERSION ) {       
+               DEBUG(1, ("tdbsam_open: Converting version %d database to version %d.\n", 
+                       version, TDBSAM_VERSION));
                
-       /* one time to get the size needed */
-       len = tdb_pack(NULL, 0,  TDB_FORMAT_STRING,
-               logon_time,
-               logoff_time,
-               kickoff_time,
-               pass_last_set_time,
-               pass_can_change_time,
-               pass_must_change_time,
-               username_len, username,
-               domain_len, domain,
-               nt_username_len, nt_username,
-               fullname_len, fullname,
-               homedir_len, homedir,
-               dir_drive_len, dir_drive,
-               logon_script_len, logon_script,
-               profile_path_len, profile_path,
-               acct_desc_len, acct_desc,
-               workstations_len, workstations,
-               unknown_str_len, unknown_str,
-               munged_dial_len, munged_dial,
-               user_rid,
-               group_rid,
-               lm_pw_len, lm_pw,
-               nt_pw_len, nt_pw,
-               pdb_get_acct_ctrl(sampass),
-               pdb_get_unknown_3(sampass),
-               pdb_get_logon_divs(sampass),
-               pdb_get_hours_len(sampass),
-               MAX_HOURS_LEN, pdb_get_hours(sampass),
-               pdb_get_unknown_5(sampass),
-               pdb_get_unknown_6(sampass));
-
-
-       /* malloc the space needed */
-       if ( (*buf=(uint8*)malloc(len)) == NULL) {
-               DEBUG(0,("init_buffer_from_sam: Unable to malloc() memory for buffer!\n"));
-               return (-1);
-       }
-       
-       /* now for the real call to tdb_pack() */
-       buflen = tdb_pack(*buf, len,  TDB_FORMAT_STRING,
-               logon_time,
-               logoff_time,
-               kickoff_time,
-               pass_last_set_time,
-               pass_can_change_time,
-               pass_must_change_time,
-               username_len, username,
-               domain_len, domain,
-               nt_username_len, nt_username,
-               fullname_len, fullname,
-               homedir_len, homedir,
-               dir_drive_len, dir_drive,
-               logon_script_len, logon_script,
-               profile_path_len, profile_path,
-               acct_desc_len, acct_desc,
-               workstations_len, workstations,
-               unknown_str_len, unknown_str,
-               munged_dial_len, munged_dial,
-               user_rid,
-               group_rid,
-               lm_pw_len, lm_pw,
-               nt_pw_len, nt_pw,
-               pdb_get_acct_ctrl(sampass),
-               pdb_get_unknown_3(sampass),
-               pdb_get_logon_divs(sampass),
-               pdb_get_hours_len(sampass),
-               MAX_HOURS_LEN, pdb_get_hours(sampass),
-               pdb_get_unknown_5(sampass),
-               pdb_get_unknown_6(sampass));
-       
-       
-       /* check to make sure we got it correct */
-       if (buflen != len) {
-               DEBUG(0, ("init_buffer_from_sam: somthing odd is going on here: bufflen (%d) != len (%d) in tdb_pack operations!\n", 
-                         buflen, len));  
-               /* error */
-               SAFE_FREE (*buf);
-               return (-1);
-       }
-
-       return (buflen);
+               if ( !tdbsam_convert(version) ) {
+                       DEBUG(0, ("tdbsam_open: Error when trying to convert tdbsam [%s]\n",name));
+                       tdb_close(tdbsam);
+                       ref_count = 0;
+                       return False;
+               }
+                       
+               DEBUG(3, ("TDBSAM converted successfully.\n"));
+       }
+       
+       DEBUG(4,("tdbsam_open: successfully opened %s\n", name ));      
+       
+       return True;
 }
 
-/***************************************************************
- Open the TDB passwd database for SAM account enumeration.
-****************************************************************/
+/****************************************************************************
+ wrapper atound tdb_close() to handle the reference count
+****************************************************************************/
 
-static NTSTATUS tdbsam_setsampwent(struct pdb_methods *my_methods, BOOL update)
+void tdbsam_close( void )
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
+       ref_count--;
        
-       /* Open tdb passwd */
-       if (!(tdb_state->passwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, update?(O_RDWR|O_CREAT):O_RDONLY, 0600)))
-       {
-               DEBUG(0, ("Unable to open/create TDB passwd\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       DEBUG(8,("tdbsam_close: Reference count is now %d.\n", ref_count));
+
+       SMB_ASSERT(ref_count >= 0 );
+       
+       if ( ref_count == 0 ) {
+               tdb_close( tdbsam );
+               tdbsam = NULL;
        }
        
-       tdb_state->key = tdb_firstkey(tdb_state->passwd_tdb);
+       return;
+}
 
-       return NT_STATUS_OK;
+/****************************************************************************
+ creates a list of user keys
+****************************************************************************/
+
+static int tdbsam_traverse_setpwent(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
+{
+       const char *prefix = USERPREFIX;
+       int  prefixlen = strlen (prefix);
+       struct pwent_list *ptr;
+       
+       if ( strncmp((const char *)key.dptr, prefix, prefixlen) == 0 ) {
+               if ( !(ptr=SMB_MALLOC_P(struct pwent_list)) ) {
+                       DEBUG(0,("tdbsam_traverse_setpwent: Failed to malloc new entry for list\n"));
+                       
+                       /* just return 0 and let the traversal continue */
+                       return 0;
+               }
+               ZERO_STRUCTP(ptr);
+               
+               /* save a copy of the key */
+               
+               ptr->key.dptr = (uint8 *)memdup( key.dptr, key.dsize );
+               if (!ptr->key.dptr) {
+                       DEBUG(0,("tdbsam_traverse_setpwent: memdup failed\n"));
+                       /* just return 0 and let the traversal continue */
+                       SAFE_FREE(ptr);
+                       return 0;
+               }
+
+               ptr->key.dsize = key.dsize;
+               
+               DLIST_ADD( tdbsam_pwent_list, ptr );
+       
+       }
+       
+       return 0;
 }
 
-static void close_tdb(struct tdbsam_privates *tdb_state) 
+/***************************************************************
+ Open the TDB passwd database for SAM account enumeration.
+ Save a list of user keys for iteration.
+****************************************************************/
+
+static NTSTATUS tdbsam_setsampwent(struct pdb_methods *my_methods, bool update, uint32 acb_mask)
 {
-       if (tdb_state->passwd_tdb) {
-               tdb_close(tdb_state->passwd_tdb);
-               tdb_state->passwd_tdb = NULL;
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+               return NT_STATUS_ACCESS_DENIED;
        }
+
+       tdb_traverse( tdbsam, tdbsam_traverse_setpwent, NULL );
+       pwent_initialized = True;
+
+       return NT_STATUS_OK;
 }
 
+
 /***************************************************************
  End enumeration of the TDB passwd list.
 ****************************************************************/
 
 static void tdbsam_endsampwent(struct pdb_methods *my_methods)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       close_tdb(tdb_state);
+       struct pwent_list *ptr, *ptr_next;
+       
+       /* close the tdb only if we have a valid pwent state */
+       
+       if ( pwent_initialized ) {
+               DEBUG(7, ("endtdbpwent: closed sam database.\n"));
+               tdbsam_close();
+       }
+       
+       /* clear out any remaining entries in the list */
        
-       DEBUG(7, ("endtdbpwent: closed sam database.\n"));
+       for ( ptr=tdbsam_pwent_list; ptr; ptr = ptr_next ) {
+               ptr_next = ptr->next;
+               DLIST_REMOVE( tdbsam_pwent_list, ptr );
+               SAFE_FREE( ptr->key.dptr);
+               SAFE_FREE( ptr );
+       }       
+       
+       pwent_initialized = False;
 }
 
 /*****************************************************************
- Get one SAM_ACCOUNT from the TDB (next in line)
+ Get one struct samu from the TDB (next in line)
 *****************************************************************/
 
-static NTSTATUS tdbsam_getsampwent(struct pdb_methods *my_methods, SAM_ACCOUNT *user)
+static NTSTATUS tdbsam_getsampwent(struct pdb_methods *my_methods, struct samu *user)
 {
-       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       TDB_DATA        data;
-       const char *prefix = USERPREFIX;
-       int  prefixlen = strlen (prefix);
+       NTSTATUS                nt_status = NT_STATUS_UNSUCCESSFUL;
+       TDB_DATA                data;
+       struct pwent_list       *pkey;
 
-
-       if (user==NULL) {
-               DEBUG(0,("pdb_get_sampwent: SAM_ACCOUNT is NULL.\n"));
+       if ( !user ) {
+               DEBUG(0,("tdbsam_getsampwent: struct samu is NULL.\n"));
                return nt_status;
        }
 
-       /* skip all non-USER entries (eg. RIDs) */
-       while ((tdb_state->key.dsize != 0) && (strncmp(tdb_state->key.dptr, prefix, prefixlen)))
-               /* increment to next in line */
-               tdb_state->key = tdb_nextkey(tdb_state->passwd_tdb, tdb_state->key);
-
-       /* do we have an valid iteration pointer? */
-       if(tdb_state->passwd_tdb == NULL) {
-               DEBUG(0,("pdb_get_sampwent: Bad TDB Context pointer.\n"));
+       if ( !tdbsam_pwent_list ) {
+               DEBUG(4,("tdbsam_getsampwent: end of list\n"));
                return nt_status;
        }
+       
+       /* pull the next entry */
+               
+       pkey = tdbsam_pwent_list;
+       DLIST_REMOVE( tdbsam_pwent_list, pkey );
+       
+       data = tdb_fetch(tdbsam, pkey->key);
 
-       data = tdb_fetch(tdb_state->passwd_tdb, tdb_state->key);
-       if (!data.dptr) {
-               DEBUG(5,("pdb_getsampwent: database entry not found.\n"));
+       SAFE_FREE( pkey->key.dptr);
+       SAFE_FREE( pkey);
+       
+       if ( !data.dptr ) {
+               DEBUG(5,("pdb_getsampwent: database entry not found.  Was the user deleted?\n"));
                return nt_status;
        }
   
-       /* unpack the buffer */
-       if (!init_sam_from_buffer(tdb_state, user, data.dptr, data.dsize)) {
-               DEBUG(0,("pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB!\n"));
-               SAFE_FREE(data.dptr);
-               return nt_status;
+       if ( !init_sam_from_buffer(user, (unsigned char *)data.dptr, data.dsize) ) {
+               DEBUG(0,("pdb_getsampwent: Bad struct samu entry returned from TDB!\n"));
        }
-       SAFE_FREE(data.dptr);
        
-       /* increment to next in line */
-       tdb_state->key = tdb_nextkey(tdb_state->passwd_tdb, tdb_state->key);
+       SAFE_FREE( data.dptr );
 
        return NT_STATUS_OK;
 }
@@ -571,57 +1023,55 @@ static NTSTATUS tdbsam_getsampwent(struct pdb_methods *my_methods, SAM_ACCOUNT *
  Lookup a name in the SAM TDB
 ******************************************************************/
 
-static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT *user, const char *sname)
+static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, struct samu *user, const char *sname)
 {
-       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       TDB_CONTEXT     *pwd_tdb;
-       TDB_DATA        data, key;
+       TDB_DATA        data;
        fstring         keystr;
        fstring         name;
 
-       if (user==NULL) {
-               DEBUG(0,("pdb_getsampwnam: SAM_ACCOUNT is NULL.\n"));
-               return nt_status;
+       if ( !user ) {
+               DEBUG(0,("pdb_getsampwnam: struct samu is NULL.\n"));
+               return NT_STATUS_NO_MEMORY;
        }
 
-       
        /* Data is stored in all lower-case */
        fstrcpy(name, sname);
-       strlower(name);
+       strlower_m(name);
 
        /* set search key */
        slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
-       key.dptr = keystr;
-       key.dsize = strlen(keystr) + 1;
 
-       /* open the accounts TDB */
-       if (!(pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDONLY, 0600))) {
-               DEBUG(0, ("pdb_getsampwnam: Unable to open TDB passwd (%s)!\n", tdb_state->tdbsam_location));
-               return nt_status;
+       /* open the database */
+               
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+               return NT_STATUS_ACCESS_DENIED;
        }
-
+       
        /* get the record */
-       data = tdb_fetch(pwd_tdb, key);
+       
+       data = tdb_fetch_bystring(tdbsam, keystr);
        if (!data.dptr) {
                DEBUG(5,("pdb_getsampwnam (TDB): error fetching database.\n"));
-               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(pwd_tdb)));
+               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
                DEBUGADD(5, (" Key: %s\n", keystr));
-               tdb_close(pwd_tdb);
-               return nt_status;
+               tdbsam_close();
+               return NT_STATUS_NO_SUCH_USER;
        }
   
        /* unpack the buffer */
-       if (!init_sam_from_buffer(tdb_state, user, data.dptr, data.dsize)) {
-               DEBUG(0,("pdb_getsampwent: Bad SAM_ACCOUNT entry returned from TDB!\n"));
+       
+       if (!init_sam_from_buffer(user, data.dptr, data.dsize)) {
+               DEBUG(0,("pdb_getsampwent: Bad struct samu entry returned from TDB!\n"));
                SAFE_FREE(data.dptr);
-               tdb_close(pwd_tdb);
-               return nt_status;
+               tdbsam_close();
+               return NT_STATUS_NO_MEMORY;
        }
+       
+       /* success */
+       
        SAFE_FREE(data.dptr);
-
-       /* no further use for database, close it now */
-       tdb_close(pwd_tdb);
+       tdbsam_close();
        
        return NT_STATUS_OK;
 }
@@ -630,370 +1080,546 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT
  Search by rid
  **************************************************************************/
 
-static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods, SAM_ACCOUNT *user, uint32 rid)
+static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods, struct samu *user, uint32 rid)
 {
-       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       TDB_CONTEXT             *pwd_tdb;
-       TDB_DATA                data, key;
+       NTSTATUS                nt_status = NT_STATUS_UNSUCCESSFUL;
+       TDB_DATA                data;
        fstring                 keystr;
        fstring                 name;
-       
-       if (user==NULL) {
-               DEBUG(0,("pdb_getsampwrid: SAM_ACCOUNT is NULL.\n"));
+
+       if ( !user ) {
+               DEBUG(0,("pdb_getsampwrid: struct samu is NULL.\n"));
                return nt_status;
        }
-
+       
        /* set search key */
+       
        slprintf(keystr, sizeof(keystr)-1, "%s%.8x", RIDPREFIX, rid);
-       key.dptr = keystr;
-       key.dsize = strlen (keystr) + 1;
 
-       /* open the accounts TDB */
-       if (!(pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDONLY, 0600))) {
-               DEBUG(0, ("pdb_getsampwrid: Unable to open TDB rid database!\n"));
-               return nt_status;
+       /* open the database */
+               
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+               return NT_STATUS_ACCESS_DENIED;
        }
 
        /* get the record */
-       data = tdb_fetch (pwd_tdb, key);
+       
+       data = tdb_fetch_bystring (tdbsam, keystr);
        if (!data.dptr) {
                DEBUG(5,("pdb_getsampwrid (TDB): error looking up RID %d by key %s.\n", rid, keystr));
-               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(pwd_tdb)));
-               tdb_close (pwd_tdb);
-               return nt_status;
+               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
 
-       fstrcpy (name, data.dptr);
+       fstrcpy(name, (const char *)data.dptr);
        SAFE_FREE(data.dptr);
        
-       tdb_close (pwd_tdb);
+       nt_status = tdbsam_getsampwnam (my_methods, user, name);
+
+ done:
+       /* cleanup */
        
-       return tdbsam_getsampwnam (my_methods, user, name);
+       tdbsam_close();
+               
+       return nt_status;
 }
 
-static NTSTATUS tdbsam_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT * user, const DOM_SID *sid)
+static NTSTATUS tdbsam_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const DOM_SID *sid)
 {
        uint32 rid;
-       if (!sid_peek_check_rid(get_global_sam_sid(), sid, &rid))
+       
+       if ( !sid_peek_check_rid(get_global_sam_sid(), sid, &rid) )
                return NT_STATUS_UNSUCCESSFUL;
+
        return tdbsam_getsampwrid(my_methods, user, rid);
 }
 
+static bool tdb_delete_samacct_only( struct samu *sam_pass )
+{
+       fstring         keystr;
+       fstring         name;
+
+       fstrcpy(name, pdb_get_username(sam_pass));
+       strlower_m(name);
+       
+       /* set the search key */
+       
+       slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
+       
+       /* it's outaa here!  8^) */
+       
+       if (tdb_delete_bystring(tdbsam, keystr) != TDB_SUCCESS) {
+               DEBUG(5, ("Error deleting entry from tdb passwd database!\n"));
+               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
+               return False;
+       }
+       
+       return True;
+}
+
 /***************************************************************************
- Delete a SAM_ACCOUNT
+ Delete a struct samu records for the username and RID key
 ****************************************************************************/
 
-static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, SAM_ACCOUNT *sam_pass)
+static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, struct samu *sam_pass)
 {
-       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       TDB_CONTEXT     *pwd_tdb;
-       TDB_DATA        key;
+       NTSTATUS        nt_status = NT_STATUS_UNSUCCESSFUL;
        fstring         keystr;
        uint32          rid;
        fstring         name;
        
+       /* open the database */
+               
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n",
+                        tdbsam_filename));
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
        fstrcpy(name, pdb_get_username(sam_pass));
-       strlower(name);
+       strlower_m(name);
        
-       /* open the TDB */
-       if (!(pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDWR, 0600))) {
-               DEBUG(0, ("Unable to open TDB passwd!"));
-               return nt_status;
-       }
-  
        /* set the search key */
+
        slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
-       key.dptr = keystr;
-       key.dsize = strlen (keystr) + 1;
        
        rid = pdb_get_user_rid(sam_pass);
 
        /* it's outaa here!  8^) */
-       if (tdb_delete(pwd_tdb, key) != TDB_SUCCESS) {
-               DEBUG(5, ("Error deleting entry from tdb passwd database!\n"));
-               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(pwd_tdb)));
-               tdb_close(pwd_tdb); 
-               return nt_status;
-       }       
 
-       /* delete also the RID key */
+       if ( tdb_delete_bystring(tdbsam, keystr) != TDB_SUCCESS ) {
+               DEBUG(5, ("Error deleting entry from tdb passwd database!\n"));
+               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
 
        /* set the search key */
+       
        slprintf(keystr, sizeof(keystr)-1, "%s%.8x", RIDPREFIX, rid);
-       key.dptr = keystr;
-       key.dsize = strlen (keystr) + 1;
 
        /* it's outaa here!  8^) */
-       if (tdb_delete(pwd_tdb, key) != TDB_SUCCESS) {
+       
+       if ( tdb_delete_bystring(tdbsam, keystr) != TDB_SUCCESS ) {
                DEBUG(5, ("Error deleting entry from tdb rid database!\n"));
-               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(pwd_tdb)));
-               tdb_close(pwd_tdb); 
-               return nt_status;
+               DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
        }
+
+       nt_status = NT_STATUS_OK;
        
-       tdb_close(pwd_tdb);
+ done:
+       tdbsam_close();
        
-       return NT_STATUS_OK;
+       return nt_status;
 }
 
+
 /***************************************************************************
- Update the TDB SAM
+ Update the TDB SAM account record only
+ Assumes that the tdbsam is already open 
 ****************************************************************************/
-
-static BOOL tdb_update_sam(struct pdb_methods *my_methods, SAM_ACCOUNT* newpwd, int flag)
+static bool tdb_update_samacct_only( struct samu* newpwd, int flag )
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
-       TDB_CONTEXT     *pwd_tdb = NULL;
-       TDB_DATA        key, data;
+       TDB_DATA        data;
        uint8           *buf = NULL;
        fstring         keystr;
        fstring         name;
-       BOOL            ret = True;
-       uint32          user_rid;
-       BOOL            tdb_ret;
-
-       /* invalidate the existing TDB iterator if it is open */
-       if (tdb_state->passwd_tdb) {
-               tdb_close(tdb_state->passwd_tdb);
-               tdb_state->passwd_tdb = NULL;
-       }
-
-       /* open the account TDB passwd*/
-       pwd_tdb = tdb_open_log(tdb_state->tdbsam_location, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
-       if (!pwd_tdb)
-       {
-               DEBUG(0, ("tdb_update_sam: Unable to open TDB passwd (%s)!\n", tdb_state->tdbsam_location));
-               return False;
-       }
-
-       /* if flag == TDB_INSERT then make up a new RID else throw an error. */
-       if (!(user_rid = pdb_get_user_rid(newpwd))) {
-               if (flag & TDB_INSERT) {
-                       if (IS_SAM_UNIX_USER(newpwd)) {
-                               if (tdb_state->algorithmic_rids) {
-                                       user_rid = fallback_pdb_uid_to_user_rid(pdb_get_uid(newpwd));
-                               } else {
-                                       user_rid = BASE_RID;
-                                       tdb_ret = tdb_change_uint32_atomic(pwd_tdb, "RID_COUNTER", &user_rid, RID_MULTIPLIER);
-                                       if (!tdb_ret) {
-                                               ret = False;
-                                               goto done;
-                                       }
-                               }
-                               pdb_set_user_sid_from_rid(newpwd, user_rid, PDB_CHANGED);
-                       } else {
-                               user_rid = tdb_state->low_nua_rid;
-                               tdb_ret = tdb_change_uint32_atomic(pwd_tdb, "NUA_RID_COUNTER", &user_rid, RID_MULTIPLIER);
-                               if (!tdb_ret) {
-                                       ret = False;
-                                       goto done;
-                               }
-                               if (user_rid > tdb_state->high_nua_rid) {
-                                       DEBUG(0, ("tdbsam: no NUA rids available, cannot add user %s!\n", pdb_get_username(newpwd)));
-                                       ret = False;
-                                       goto done;
-                               }
-                               pdb_set_user_sid_from_rid(newpwd, user_rid, PDB_CHANGED);
-                       }
-               } else {
-                       DEBUG (0,("tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a RID\n",pdb_get_username(newpwd)));
-                       ret = False;
-                       goto done;
-               }
-       }
-
-       if (!pdb_get_group_rid(newpwd)) {
-               if (flag & TDB_INSERT) {
-                       if (!tdb_state->permit_non_unix_accounts) {
-                               DEBUG (0,("tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a primary group RID\n",pdb_get_username(newpwd)));
-                               ret = False;
-                               goto done;
-                       } else {
-                               /* This seems like a good default choice for non-unix users */
-                               pdb_set_group_sid_from_rid(newpwd, DOMAIN_GROUP_RID_USERS, PDB_DEFAULT);
-                       }
-               } else {
-                       DEBUG (0,("tdb_update_sam: Failing to store a SAM_ACCOUNT for [%s] without a primary group RID\n",pdb_get_username(newpwd)));
-                       ret = False;
-                       goto done;
-               }
-       }
+       bool            ret = True;
 
-       /* copy the SAM_ACCOUNT struct into a BYTE buffer for storage */
-       if ((data.dsize=init_buffer_from_sam (tdb_state, &buf, newpwd)) == -1) {
-               DEBUG(0,("tdb_update_sam: ERROR - Unable to copy SAM_ACCOUNT info BYTE buffer!\n"));
+       /* copy the struct samu struct into a BYTE buffer for storage */
+       
+       if ( (data.dsize=init_buffer_from_sam (&buf, newpwd, False)) == -1 ) {
+               DEBUG(0,("tdb_update_sam: ERROR - Unable to copy struct samu info BYTE buffer!\n"));
                ret = False;
                goto done;
        }
        data.dptr = buf;
 
        fstrcpy(name, pdb_get_username(newpwd));
-       strlower(name);
+       strlower_m(name);
        
-       DEBUG(5, ("Storing %saccount %s with RID %d\n", flag == TDB_INSERT ? "(new) " : "", name, user_rid));
+       DEBUG(5, ("Storing %saccount %s with RID %d\n", 
+                 flag == TDB_INSERT ? "(new) " : "", name, 
+                 pdb_get_user_rid(newpwd)));
 
        /* setup the USER index key */
        slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
-       key.dptr = keystr;
-       key.dsize = strlen (keystr) + 1;
 
        /* add the account */
-       if (tdb_store(pwd_tdb, key, data, flag) != TDB_SUCCESS) {
+       
+       if ( tdb_store_bystring(tdbsam, keystr, data, flag) != TDB_SUCCESS ) {
                DEBUG(0, ("Unable to modify passwd TDB!"));
-               DEBUGADD(0, (" Error: %s", tdb_errorstr(pwd_tdb)));
-               DEBUGADD(0, (" occured while storing the main record (%s)\n", keystr));
+               DEBUGADD(0, (" Error: %s", tdb_errorstr(tdbsam)));
+               DEBUGADD(0, (" occured while storing the main record (%s)\n",
+                            keystr));
                ret = False;
                goto done;
        }
+
+done:  
+       /* cleanup */
+       SAFE_FREE(buf);
        
+       return ret;
+}
+
+/***************************************************************************
+ Update the TDB SAM RID record only
+ Assumes that the tdbsam is already open 
+****************************************************************************/
+static bool tdb_update_ridrec_only( struct samu* newpwd, int flag )
+{
+       TDB_DATA        data;
+       fstring         keystr;
+       fstring         name;
+
+       fstrcpy(name, pdb_get_username(newpwd));
+       strlower_m(name);
+
        /* setup RID data */
-       data.dsize = sizeof(fstring);
-       data.dptr = name;
+       data = string_term_tdb_data(name);
 
        /* setup the RID index key */
-       slprintf(keystr, sizeof(keystr)-1, "%s%.8x", RIDPREFIX, user_rid);
-       key.dptr = keystr;
-       key.dsize = strlen (keystr) + 1;
+       slprintf(keystr, sizeof(keystr)-1, "%s%.8x", RIDPREFIX,  pdb_get_user_rid(newpwd));
        
        /* add the reference */
-       if (tdb_store(pwd_tdb, key, data, flag) != TDB_SUCCESS) {
+       if (tdb_store_bystring(tdbsam, keystr, data, flag) != TDB_SUCCESS) {
                DEBUG(0, ("Unable to modify TDB passwd !"));
-               DEBUGADD(0, (" Error: %s\n", tdb_errorstr(pwd_tdb)));
+               DEBUGADD(0, (" Error: %s\n", tdb_errorstr(tdbsam)));
                DEBUGADD(0, (" occured while storing the RID index (%s)\n", keystr));
-               ret = False;
-               goto done;
+               return False;
+       }
+
+       return True;
+
+}
+
+/***************************************************************************
+ Update the TDB SAM
+****************************************************************************/
+
+static bool tdb_update_sam(struct pdb_methods *my_methods, struct samu* newpwd, int flag)
+{
+       bool            result = True;
+
+       /* invalidate the existing TDB iterator if it is open */
+       
+       tdbsam_endsampwent( my_methods );
+       
+#if 0 
+       if ( !pdb_get_group_rid(newpwd) ) {
+               DEBUG (0,("tdb_update_sam: Failing to store a struct samu for [%s] "
+                       "without a primary group RID\n", pdb_get_username(newpwd)));
+               return False;
+       }
+#endif
+
+       if (!pdb_get_user_rid(newpwd)) {
+               DEBUG(0,("tdb_update_sam: struct samu (%s) with no RID!\n", pdb_get_username(newpwd)));
+               return False;
+       }
+
+       /* open the database */
+               
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+               return False;
+       }
+       
+       if ( !tdb_update_samacct_only(newpwd, flag) || !tdb_update_ridrec_only(newpwd, flag)) {
+               result = False;
        }
 
-done:  
        /* cleanup */
-       tdb_close (pwd_tdb);
-       SAFE_FREE(buf);
+
+       tdbsam_close();
        
-       return (ret);   
+       return result;  
 }
 
 /***************************************************************************
- Modifies an existing SAM_ACCOUNT
+ Modifies an existing struct samu
 ****************************************************************************/
 
-static NTSTATUS tdbsam_update_sam_account (struct pdb_methods *my_methods, SAM_ACCOUNT *newpwd)
+static NTSTATUS tdbsam_update_sam_account (struct pdb_methods *my_methods, struct samu *newpwd)
 {
-       if (tdb_update_sam(my_methods, newpwd, TDB_MODIFY))
-               return NT_STATUS_OK;
-       else
+       if ( !tdb_update_sam(my_methods, newpwd, TDB_MODIFY) )
                return NT_STATUS_UNSUCCESSFUL;
+       
+       return NT_STATUS_OK;
 }
 
 /***************************************************************************
- Adds an existing SAM_ACCOUNT
+ Adds an existing struct samu
 ****************************************************************************/
 
-static NTSTATUS tdbsam_add_sam_account (struct pdb_methods *my_methods, SAM_ACCOUNT *newpwd)
+static NTSTATUS tdbsam_add_sam_account (struct pdb_methods *my_methods, struct samu *newpwd)
 {
-       if (tdb_update_sam(my_methods, newpwd, TDB_INSERT))
-               return NT_STATUS_OK;
-       else
+       if ( !tdb_update_sam(my_methods, newpwd, TDB_INSERT) )
                return NT_STATUS_UNSUCCESSFUL;
+               
+       return NT_STATUS_OK;
 }
 
-static void free_private_data(void **vp) 
+/***************************************************************************
+ Renames a struct samu
+ - check for the posix user/rename user script
+ - Add and lock the new user record
+ - rename the posix user
+ - rewrite the rid->username record
+ - delete the old user
+ - unlock the new user record
+***************************************************************************/
+static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
+                                         struct samu *old_acct, 
+                                         const char *newname)
 {
-       struct tdbsam_privates **tdb_state = (struct tdbsam_privates **)vp;
-       close_tdb(*tdb_state);
-       *tdb_state = NULL;
+       struct samu      *new_acct = NULL;
+       pstring          rename_script;
+       bool             interim_account = False;
+       int              rename_ret;
+       fstring          oldname_lower;
+       fstring          newname_lower;
+
+       /* can't do anything without an external script */
+       
+       pstrcpy(rename_script, lp_renameuser_script() );
+       if ( ! *rename_script ) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       /* invalidate the existing TDB iterator if it is open */
+       
+       tdbsam_endsampwent( my_methods );
+
+       if ( !(new_acct = samu_new( NULL )) ) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       if ( !pdb_copy_sam_account(new_acct, old_acct) 
+               || !pdb_set_username(new_acct, newname, PDB_CHANGED)) 
+       {
+               TALLOC_FREE(new_acct );
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* open the database */
+               
+       if ( !tdbsam_open( tdbsam_filename ) ) {
+               DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
+               TALLOC_FREE(new_acct );
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       /* add the new account and lock it */
+       
+       if ( !tdb_update_samacct_only(new_acct, TDB_INSERT) ) {
+               goto done;
+       }
+       
+       interim_account = True;
+
+       if ( tdb_lock_bystring_with_timeout(tdbsam, newname, 30) == -1 ) {
+               goto done;
+       }
+
+       /* Rename the posix user.  Follow the semantics of _samr_create_user()
+          so that we lower case the posix name but preserve the case in passdb */
+
+       fstrcpy( oldname_lower, pdb_get_username(old_acct) );
+       strlower_m( oldname_lower );
+
+       fstrcpy( newname_lower, newname );
+       strlower_m( newname_lower );
+
+       string_sub2(rename_script, "%unew", newname_lower, sizeof(pstring), 
+               True, False, True);
+       string_sub2(rename_script, "%uold", oldname_lower, sizeof(pstring), 
+               True, False, True);
+       rename_ret = smbrun(rename_script, NULL);
+
+       DEBUG(rename_ret ? 0 : 3,("Running the command `%s' gave %d\n", rename_script, rename_ret));
+
+       if (rename_ret == 0) {
+               smb_nscd_flush_user_cache();
+       }
+
+       if (rename_ret) {
+               goto done; 
+       }
+
+       /* rewrite the rid->username record */
+       
+       if ( !tdb_update_ridrec_only( new_acct, TDB_MODIFY) ) {
+               goto done;
+       }
+       interim_account = False;
+       tdb_unlock_bystring( tdbsam, newname );
 
-       /* No need to free any further, as it is talloc()ed */
+       tdb_delete_samacct_only( old_acct );
+       
+       tdbsam_close();
+       
+       TALLOC_FREE(new_acct );
+       return NT_STATUS_OK;
+
+done:  
+       /* cleanup */
+       if (interim_account) {
+               tdb_unlock_bystring(tdbsam, newname);
+               tdb_delete_samacct_only(new_acct);
+       }
+       
+       tdbsam_close();
+       
+       if (new_acct)
+               TALLOC_FREE(new_acct);
+       
+       return NT_STATUS_ACCESS_DENIED; 
+}
+
+static bool tdbsam_rid_algorithm(struct pdb_methods *methods)
+{
+       return False;
 }
 
+/*
+ * Historically, winbind was responsible for allocating RIDs, so the next RID
+ * value was stored in winbindd_idmap.tdb. It has been moved to passdb now,
+ * but for compatibility reasons we still keep the the next RID counter in
+ * winbindd_idmap.tdb.
+ */
+
+/*****************************************************************************
+ Initialise idmap database. For now (Dec 2005) this is a copy of the code in
+ sam/idmap_tdb.c. Maybe at a later stage we can remove that capability from
+ winbind completely and store the RID counter in passdb.tdb.
 
-NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location)
+ Dont' fully initialize with the HWM values, if it's new, we're only
+ interested in the RID counter.
+*****************************************************************************/
+
+static bool init_idmap_tdb(TDB_CONTEXT *tdb)
 {
-       NTSTATUS nt_status;
-       struct tdbsam_privates *tdb_state;
+       int32 version;
 
-#if 0 /* when made a module use this */
-       tdbsam_debug_level = debug_add_class("tdbsam");
-       if(tdbsam_debug_level == -1) {
-               tdbsam_debug_level = DBGC_ALL;
-               DEBUG(0, ("tdbsam: Couldn't register custom debugging class!\n"));
+       if (tdb_lock_bystring(tdb, "IDMAP_VERSION") != 0) {
+               DEBUG(0, ("Could not lock IDMAP_VERSION\n"));
+               return False;
        }
-#endif
 
-       if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
-               return nt_status;
+       version = tdb_fetch_int32(tdb, "IDMAP_VERSION");
+
+       if (version == -1) {
+               /* No key found, must be a new db */
+               if (tdb_store_int32(tdb, "IDMAP_VERSION",
+                                   IDMAP_VERSION) != 0) {
+                       DEBUG(0, ("Could not store IDMAP_VERSION\n"));
+                       tdb_unlock_bystring(tdb, "IDMAP_VERSION");
+                       return False;
+               }
+               version = IDMAP_VERSION;
        }
 
-       (*pdb_method)->name = "tdbsam";
+       if (version != IDMAP_VERSION) {
+               DEBUG(0, ("Expected IDMAP_VERSION=%d, found %d. Please "
+                         "start winbind once\n", IDMAP_VERSION, version));
+               tdb_unlock_bystring(tdb, "IDMAP_VERSION");
+               return False;
+       }
 
-       (*pdb_method)->setsampwent = tdbsam_setsampwent;
-       (*pdb_method)->endsampwent = tdbsam_endsampwent;
-       (*pdb_method)->getsampwent = tdbsam_getsampwent;
-       (*pdb_method)->getsampwnam = tdbsam_getsampwnam;
-       (*pdb_method)->getsampwsid = tdbsam_getsampwsid;
-       (*pdb_method)->add_sam_account = tdbsam_add_sam_account;
-       (*pdb_method)->update_sam_account = tdbsam_update_sam_account;
-       (*pdb_method)->delete_sam_account = tdbsam_delete_sam_account;
+       tdb_unlock_bystring(tdb, "IDMAP_VERSION");
+       return True;
+}
 
-       tdb_state = talloc_zero(pdb_context->mem_ctx, sizeof(struct tdbsam_privates));
+static bool tdbsam_new_rid(struct pdb_methods *methods, uint32 *prid)
+{
+       TDB_CONTEXT *tdb;
+       uint32 rid;
+       bool ret = False;
 
-       if (!tdb_state) {
-               DEBUG(0, ("talloc() failed for tdbsam private_data!\n"));
-               return NT_STATUS_NO_MEMORY;
+       tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0,
+                          TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
+
+       if (tdb == NULL) {
+               DEBUG(1, ("Could not open idmap: %s\n", strerror(errno)));
+               goto done;
        }
 
-       if (location) {
-               tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
-       } else {
-               pstring tdbfile;
-               get_private_directory(tdbfile);
-               pstrcat(tdbfile, "/");
-               pstrcat(tdbfile, PASSDB_FILE_NAME);
-               tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
+       if (!init_idmap_tdb(tdb)) {
+               DEBUG(1, ("Could not init idmap\n"));
+               goto done;
        }
 
-       tdb_state->algorithmic_rids = True;
+       rid = BASE_RID;         /* Default if not set */
+
+       if (!tdb_change_uint32_atomic(tdb, "RID_COUNTER", &rid, 1)) {
+               DEBUG(3, ("tdbsam_new_rid: Failed to increase RID_COUNTER\n"));
+               goto done;
+       }
 
-       (*pdb_method)->private_data = tdb_state;
+       *prid = rid;
+       ret = True;
 
-       (*pdb_method)->free_private_data = free_private_data;
+ done:
+       if ((tdb != NULL) && (tdb_close(tdb) != 0)) {
+               smb_panic("tdb_close(idmap_tdb) failed");
+       }
 
-       return NT_STATUS_OK;
+       return ret;
 }
 
-NTSTATUS pdb_init_tdbsam_nua(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location)
+/*********************************************************************
+ Initialize the tdb sam backend.  Setup the dispath table of methods,
+ open the tdb, etc...
+*********************************************************************/
+
+static NTSTATUS pdb_init_tdbsam(struct pdb_methods **pdb_method, const char *location)
 {
        NTSTATUS nt_status;
-       struct tdbsam_privates *tdb_state;
-       uint32 low_nua_uid, high_nua_uid;
+       pstring tdbfile;
+       const char *pfile = location;
 
-       if (!NT_STATUS_IS_OK(nt_status = pdb_init_tdbsam(pdb_context, pdb_method, location))) {
+       if (!NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method ))) {
                return nt_status;
        }
 
-       (*pdb_method)->name = "tdbsam_nua";
+       (*pdb_method)->name = "tdbsam";
 
-       tdb_state = (*pdb_method)->private_data;
+       (*pdb_method)->setsampwent = tdbsam_setsampwent;
+       (*pdb_method)->endsampwent = tdbsam_endsampwent;
+       (*pdb_method)->getsampwent = tdbsam_getsampwent;
+       (*pdb_method)->getsampwnam = tdbsam_getsampwnam;
+       (*pdb_method)->getsampwsid = tdbsam_getsampwsid;
+       (*pdb_method)->add_sam_account = tdbsam_add_sam_account;
+       (*pdb_method)->update_sam_account = tdbsam_update_sam_account;
+       (*pdb_method)->delete_sam_account = tdbsam_delete_sam_account;
+       (*pdb_method)->rename_sam_account = tdbsam_rename_sam_account;
 
-       tdb_state->permit_non_unix_accounts = True;
+       (*pdb_method)->rid_algorithm = tdbsam_rid_algorithm;
+       (*pdb_method)->new_rid = tdbsam_new_rid;
 
-       if (!lp_winbind_uid(&low_nua_uid, &high_nua_uid)) {
-               DEBUG(0, ("cannot use tdbsam_nua without 'winbind uid' range in smb.conf!\n"));
-               return NT_STATUS_UNSUCCESSFUL;
+       /* save the path for later */
+                          
+       if ( !location ) {
+               pstr_sprintf( tdbfile, "%s/%s", lp_private_dir(), PASSDB_FILE_NAME );
+               pfile = tdbfile;
        }
+       pstrcpy( tdbsam_filename, pfile );
 
-       tdb_state->low_nua_rid=fallback_pdb_uid_to_user_rid(low_nua_uid);
-
-       tdb_state->high_nua_rid=fallback_pdb_uid_to_user_rid(high_nua_uid);
+       /* no private data */
+       
+       (*pdb_method)->private_data      = NULL;
+       (*pdb_method)->free_private_data = NULL;
 
        return NT_STATUS_OK;
 }
 
 NTSTATUS pdb_tdbsam_init(void)
 {
-       smb_register_passdb(PASSDB_INTERFACE_VERSION, "tdbsam", pdb_init_tdbsam);
-       smb_register_passdb(PASSDB_INTERFACE_VERSION, "tdbsam_nua", pdb_init_tdbsam_nua);
-       return NT_STATUS_OK;
+       return smb_register_passdb(PASSDB_INTERFACE_VERSION, "tdbsam", pdb_init_tdbsam);
 }
-