This is the 'multiple pdb backends' patch from ctrlsoft, aka Jelmer Vernooij
[kai/samba.git] / source3 / passdb / pdb_tdb.c
index 0e0bf541e390e757cd3dad93173b21db6fce5bc9..7092caa15ef557fce936719fad331111cfcca37e 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Unix SMB/Netbios implementation. Version 1.9. SMB parameters and setup
+ * Unix SMB/CIFS implementation. 
+ * SMB parameters and setup
  * Copyright (C) Andrew Tridgell 1992-1998
  * Copyright (C) Simo Sorce 2000
  * Copyright (C) Gerald Carter 2000
@@ -26,7 +27,7 @@
 #ifdef WITH_TDB_SAM
 
 #define PDB_VERSION            "20010830"
-#define PASSDB_FILE_NAME       "/passdb.tdb"
+#define PASSDB_FILE_NAME       "passdb.tdb"
 #define TDB_FORMAT_STRING      "ddddddBBBBBBBBBBBBddBBwdwdBdd"
 #define USERPREFIX             "USER_"
 #define RIDPREFIX              "RID_"
@@ -40,8 +41,8 @@ struct tdbsam_privates {
 
        BOOL permit_non_unix_accounts;
 
-       uint32 low_nua_rid; 
-       uint32 high_nua_rid; 
+/*     uint32 low_nua_rid; 
+       uint32 high_nua_rid; */
 };
 
 /**********************************************************************
@@ -78,13 +79,18 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
                fullname_len, homedir_len, logon_script_len,
                profile_path_len, acct_desc_len, workstations_len;
                
-       uint32  /* uid, gid,*/ user_rid, group_rid, unknown_3, hours_len, unknown_5, unknown_6;
+       uint32  user_rid, group_rid, unknown_3, hours_len, unknown_5, unknown_6;
        uint16  acct_ctrl, logon_divs;
        uint8   *hours;
        static uint8    *lm_pw_ptr, *nt_pw_ptr;
        uint32          len = 0;
        uint32          lmpwlen, ntpwlen, hourslen;
        BOOL ret = True;
+       BOOL setflag;
+       pstring sub_buffer;
+       struct passwd *pw;
+       uid_t uid;
+       gid_t gid = -1; /* This is what standard sub advanced expects if no gid is known */
        
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_sam_from_buffer: NULL parameters found!\n"));
@@ -128,29 +134,93 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
                goto done;
        }
 
-       pdb_set_logon_time(sampass, logon_time);
-       pdb_set_logoff_time(sampass, logoff_time);
-       pdb_set_kickoff_time(sampass, kickoff_time);
-       pdb_set_pass_can_change_time(sampass, pass_can_change_time);
-       pdb_set_pass_must_change_time(sampass, pass_must_change_time);
+       /* 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));
+                       ret = False;
+                       goto done;
+               }
+       }
+               
+       if (pw) {
+               uid = pw->pw_uid;
+               gid = pw->pw_gid;
+               
+               passwd_free(&pw);
+
+               pdb_set_uid(sampass, uid);
+               pdb_set_gid(sampass, gid);
+       }
+
+       pdb_set_logon_time(sampass, logon_time, True);
+       pdb_set_logoff_time(sampass, logoff_time, True);
+       pdb_set_kickoff_time(sampass, kickoff_time, True);
+       pdb_set_pass_can_change_time(sampass, pass_can_change_time, True);
+       pdb_set_pass_must_change_time(sampass, pass_must_change_time, True);
        pdb_set_pass_last_set_time(sampass, pass_last_set_time);
 
-       pdb_set_username     (sampass, username_len?username:NULL);
-       pdb_set_domain       (sampass, domain_len?domain:NULL);
-       pdb_set_nt_username  (sampass, nt_username_len?nt_username:NULL);
-       pdb_set_fullname     (sampass, fullname_len?fullname:NULL);
-       pdb_set_homedir      (sampass, homedir_len?homedir:NULL, True);
-       pdb_set_dir_drive    (sampass, dir_drive_len?dir_drive:NULL, True);
-       pdb_set_logon_script (sampass, logon_script_len?logon_script:NULL, True);
-       pdb_set_profile_path (sampass, profile_path_len?profile_path:NULL, True);
-       pdb_set_acct_desc    (sampass, acct_desc_len?acct_desc:NULL);
-       pdb_set_workstations (sampass, workstations_len?workstations:NULL);
-       pdb_set_munged_dial  (sampass, munged_dial_len?munged_dial:NULL);
-       if (!pdb_set_lanman_passwd(sampass, lmpwlen?lm_pw_ptr:NULL)) {
+       pdb_set_username     (sampass, username);
+       pdb_set_domain       (sampass, domain);
+       pdb_set_nt_username  (sampass, nt_username);
+       pdb_set_fullname     (sampass, fullname);
+
+       if (homedir) setflag = True;
+       else {
+               setflag = False;
+               pstrcpy(sub_buffer, lp_logon_home());
+               /* standard_sub_advanced() assumes pstring is passed!! */
+               standard_sub_advanced(-1, username, "", gid, username, sub_buffer);
+               homedir = strdup(sub_buffer);
+               if(!homedir) { ret = False; goto done; }
+               DEBUG(5,("Home directory set back to %s\n", homedir));
+       }
+       pdb_set_homedir(sampass, homedir, setflag);
+
+       if (dir_drive) setflag = True;
+       else {
+               setflag = False;
+               pstrcpy(sub_buffer, lp_logon_drive());
+               standard_sub_advanced(-1, username, "", gid, username, sub_buffer);
+               dir_drive = strdup(sub_buffer);
+               if(!dir_drive) { ret = False; goto done; }
+               DEBUG(5,("Drive set back to %s\n", dir_drive));
+       }
+       pdb_set_dir_drive(sampass, dir_drive, setflag);
+
+       if (logon_script) setflag = True;
+       else {
+               setflag = False;
+               pstrcpy(sub_buffer, lp_logon_script());
+               standard_sub_advanced(-1, username, "", gid, username, sub_buffer);
+               logon_script = strdup(sub_buffer);
+               if(!logon_script) { ret = False; goto done; }
+               DEBUG(5,("Logon script set back to %s\n", logon_script));
+       }
+       pdb_set_logon_script(sampass, logon_script, setflag);
+
+       if (profile_path) setflag = True;
+       else {
+               setflag = False;
+               pstrcpy(sub_buffer, lp_logon_path());
+               standard_sub_advanced(-1, username, "", gid, username, sub_buffer);
+               profile_path = strdup(sub_buffer);
+               if(!profile_path) { ret = False; goto done; }
+               DEBUG(5,("Profile path set back to %s\n", profile_path));
+       }
+       pdb_set_profile_path(sampass, profile_path, setflag);
+
+       pdb_set_acct_desc    (sampass, acct_desc);
+       pdb_set_workstations (sampass, workstations);
+       pdb_set_munged_dial  (sampass, munged_dial);
+       if (!pdb_set_lanman_passwd(sampass, lm_pw_ptr)) {
                ret = False;
                goto done;
        }
-       if (!pdb_set_nt_passwd(sampass, ntpwlen?nt_pw_ptr:NULL)) {
+       if (!pdb_set_nt_passwd(sampass, nt_pw_ptr)) {
                ret = False;
                goto done;
        }
@@ -165,28 +235,6 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
        pdb_set_logon_divs(sampass, logon_divs);
        pdb_set_hours(sampass, hours);
 
-       if ((tdb_state->permit_non_unix_accounts) 
-           && (pdb_get_user_rid(sampass) >= tdb_state->low_nua_rid)
-           && (pdb_get_user_rid(sampass) <= tdb_state->high_nua_rid)) {
-               
-       } else {
-               struct passwd *pw;
-               /* validate the account and fill in UNIX uid and gid.  sys_getpwnam()
-                  is used instaed of Get_Pwnam() as we do not need to try case
-                  permutations */
-
-               if ((pw=getpwnam_alloc(pdb_get_username(sampass))) == NULL) {
-                       DEBUG(0,("init_sam_from_buffer: (tdbsam) getpwnam(%s) return NULL.  User does not exist!\n", 
-                                pdb_get_username(sampass)));
-                       return False;
-               }
-
-               pdb_set_uid(sampass, pw->pw_uid);
-               pdb_set_gid(sampass, pw->pw_gid);
-               
-               passwd_free(&pw);
-       }
-
 done:
 
        SAFE_FREE(username);
@@ -207,8 +255,8 @@ done:
 /**********************************************************************
  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, uint32 user_rid, uint32 group_rid)
+static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state,
+                                   uint8 **buf, const SAM_ACCOUNT *sampass)
 {
        size_t          len, buflen;
 
@@ -221,6 +269,9 @@ static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state, uint8 **b
                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;
@@ -259,73 +310,69 @@ static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state, uint8 **b
        pass_must_change_time = (uint32)pdb_get_pass_must_change_time(sampass);
        pass_last_set_time = (uint32)pdb_get_pass_last_set_time(sampass);
 
+       user_rid = pdb_get_user_rid(sampass);
+       group_rid = pdb_get_group_rid(sampass);
 
        username = pdb_get_username(sampass);
-       if (username)
-               username_len = strlen(username) +1;
-       else
-               username_len = 0;
+       if (username) username_len = strlen(username) +1;
+       else username_len = 0;
+
        domain = pdb_get_domain(sampass);
-       if (domain)
-               domain_len = strlen(domain) +1;
-       else
-               domain_len = 0;
+       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;
-       dir_drive = pdb_get_dirdrive(sampass);
-       if (dir_drive)
-               dir_drive_len = strlen(dir_drive) +1;
-       else
-               dir_drive_len = 0;
-       unknown_str = NULL;
-       unknown_str_len = 0;
-       munged_dial = pdb_get_munged_dial(sampass);
-       if (munged_dial)
-               munged_dial_len = strlen(munged_dial) +1;
-       else
-               munged_dial_len = 0;
-               
+       if (nt_username) nt_username_len = strlen(nt_username) +1;
+       else nt_username_len = 0;
+
        fullname = pdb_get_fullname(sampass);
-       if (fullname)
-               fullname_len = strlen(fullname) +1;
-       else
-               fullname_len = 0;
-       homedir = pdb_get_homedir(sampass);
-       if (homedir)
-               homedir_len = strlen(homedir) +1;
-       else
-               homedir_len = 0;
-       logon_script = pdb_get_logon_script(sampass);
-       if (logon_script)
-               logon_script_len = strlen(logon_script) +1;
-       else
-               logon_script_len = 0;
-       profile_path = pdb_get_profile_path(sampass);
-       if (profile_path)
-               profile_path_len = strlen(profile_path) +1;
-       else
-               profile_path_len = 0;
-       acct_desc = pdb_get_acct_desc(sampass);
-       if (acct_desc)
-               acct_desc_len = strlen(acct_desc) +1;
-       else
-               acct_desc_len = 0;
-       workstations = pdb_get_workstations(sampass);
-       if (workstations)
-               workstations_len = strlen(workstations) +1;
-       else
-               workstations_len = 0;
+       if (fullname) fullname_len = strlen(fullname) +1;
+       else fullname_len = 0;
+
+       /*
+        * Only updates fields which have been set (not defaults from smb.conf)
+        */
+
+       if (IS_SAM_SET(sampass, FLAG_SAM_DRIVE)) dir_drive = pdb_get_dirdrive(sampass);
+       else dir_drive = NULL;
+       if (dir_drive) dir_drive_len = strlen(dir_drive) +1;
+       else dir_drive_len = 0;
+
+       if (IS_SAM_SET(sampass, FLAG_SAM_SMBHOME)) homedir = pdb_get_homedir(sampass);
+       else homedir = NULL;
+       if (homedir) homedir_len = strlen(homedir) +1;
+       else homedir_len = 0;
+
+       if (IS_SAM_SET(sampass, FLAG_SAM_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;
+
+       if (IS_SAM_SET(sampass, FLAG_SAM_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;
        
        lm_pw = pdb_get_lanman_passwd(sampass);
-       if (!lm_pw)
-               lm_pw_len = 0;
+       if (!lm_pw) lm_pw_len = 0;
        
        nt_pw = pdb_get_nt_passwd(sampass);
-       if (!nt_pw)
-               nt_pw_len = 0;
+       if (!nt_pw) nt_pw_len = 0;
+               
+       acct_desc = pdb_get_acct_desc(sampass);
+       if (acct_desc) acct_desc_len = strlen(acct_desc) +1;
+       else acct_desc_len = 0;
+
+       workstations = pdb_get_workstations(sampass);
+       if (workstations) workstations_len = strlen(workstations) +1;
+       else workstations_len = 0;
+
+       unknown_str = NULL;
+       unknown_str_len = 0;
+
+       munged_dial = pdb_get_munged_dial(sampass);
+       if (munged_dial) munged_dial_len = strlen(munged_dial) +1;
+       else munged_dial_len = 0;       
                
        /* one time to get the size needed */
        len = tdb_pack(NULL, 0,  TDB_FORMAT_STRING,
@@ -415,9 +462,9 @@ static uint32 init_buffer_from_sam (struct tdbsam_privates *tdb_state, uint8 **b
  Open the TDB passwd database for SAM account enumeration.
 ****************************************************************/
 
-static BOOL tdbsam_setsampwent(struct pdb_context *context, BOOL update)
+static BOOL tdbsam_setsampwent(struct pdb_methods *my_methods, BOOL update)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        
        /* 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)))
@@ -443,9 +490,9 @@ static void close_tdb(struct tdbsam_privates *tdb_state)
  End enumeration of the TDB passwd list.
 ****************************************************************/
 
-static void tdbsam_endsampwent(struct pdb_context *context)
+static void tdbsam_endsampwent(struct pdb_methods *my_methods)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        close_tdb(tdb_state);
        
        DEBUG(7, ("endtdbpwent: closed sam database.\n"));
@@ -455,9 +502,9 @@ static void tdbsam_endsampwent(struct pdb_context *context)
  Get one SAM_ACCOUNT from the TDB (next in line)
 *****************************************************************/
 
-static BOOL tdbsam_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
+static BOOL tdbsam_getsampwent(struct pdb_methods *my_methods, SAM_ACCOUNT *user)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        TDB_DATA        data;
        char *prefix = USERPREFIX;
        int  prefixlen = strlen (prefix);
@@ -503,9 +550,9 @@ static BOOL tdbsam_getsampwent(struct pdb_context *context, SAM_ACCOUNT *user)
  Lookup a name in the SAM TDB
 ******************************************************************/
 
-static BOOL tdbsam_getsampwnam (struct pdb_context *context, SAM_ACCOUNT *user, const char *sname)
+static BOOL tdbsam_getsampwnam (struct pdb_methods *my_methods, SAM_ACCOUNT *user, const char *sname)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        TDB_CONTEXT     *pwd_tdb;
        TDB_DATA        data, key;
        fstring         keystr;
@@ -559,9 +606,9 @@ static BOOL tdbsam_getsampwnam (struct pdb_context *context, SAM_ACCOUNT *user,
  Search by rid
  **************************************************************************/
 
-static BOOL tdbsam_getsampwrid (struct pdb_context *context, SAM_ACCOUNT *user, uint32 rid)
+static BOOL tdbsam_getsampwrid (struct pdb_methods *my_methods, SAM_ACCOUNT *user, uint32 rid)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        TDB_CONTEXT             *pwd_tdb;
        TDB_DATA                data, key;
        fstring                 keystr;
@@ -586,7 +633,7 @@ static BOOL tdbsam_getsampwrid (struct pdb_context *context, SAM_ACCOUNT *user,
        /* get the record */
        data = tdb_fetch (pwd_tdb, key);
        if (!data.dptr) {
-               DEBUG(5,("pdb_getsampwrid (TDB): error fetching database.\n"));
+               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 False;
@@ -597,16 +644,16 @@ static BOOL tdbsam_getsampwrid (struct pdb_context *context, SAM_ACCOUNT *user,
        
        tdb_close (pwd_tdb);
        
-       return tdbsam_getsampwnam (context, user, name);
+       return tdbsam_getsampwnam (my_methods, user, name);
 }
 
 /***************************************************************************
  Delete a SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL tdbsam_delete_sam_account(struct pdb_context *context, const SAM_ACCOUNT *sam_pass)
+static BOOL tdbsam_delete_sam_account(struct pdb_methods *my_methods, const SAM_ACCOUNT *sam_pass)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        TDB_CONTEXT     *pwd_tdb;
        TDB_DATA        key;
        fstring         keystr;
@@ -660,18 +707,17 @@ static BOOL tdbsam_delete_sam_account(struct pdb_context *context, const SAM_ACC
  Update the TDB SAM
 ****************************************************************************/
 
-static BOOL tdb_update_sam(struct pdb_context *context, const SAM_ACCOUNT* newpwd, int flag)
+static BOOL tdb_update_sam(struct pdb_methods *my_methods, const SAM_ACCOUNT* newpwd, int flag)
 {
-       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)context->pdb_selected->private_data;
+       struct tdbsam_privates *tdb_state = (struct tdbsam_privates *)my_methods->private_data;
        TDB_CONTEXT     *pwd_tdb = NULL;
        TDB_DATA        key, data;
        uint8           *buf = NULL;
        fstring         keystr;
        fstring         name;
        BOOL            ret = True;
-       uint32          user_rid;
-       uint32         group_rid;
-       int32          tdb_ret;
+       uint32          user_rid;
+       int32           tdb_ret;
 
        /* invalidate the existing TDB iterator if it is open */
        if (tdb_state->passwd_tdb) {
@@ -687,35 +733,42 @@ static BOOL tdb_update_sam(struct pdb_context *context, const SAM_ACCOUNT* newpw
                return False;
        }
 
-       /* if we don't have a RID, then make them up. */
+       /* if flag == TDB_INSERT then make up a new RID else throw an error. */
        if (!(user_rid = pdb_get_user_rid(newpwd))) {
-               if (!tdb_state->permit_non_unix_accounts) {
-                       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;
-               } else {
-                       user_rid = tdb_state->low_nua_rid;
-                       tdb_ret = tdb_change_int32_atomic(pwd_tdb, "NUA_NEXT_RID", &user_rid, RID_MULTIPLIER);
+               if (flag & TDB_INSERT) {
+                       user_rid = BASE_RID;
+                       tdb_ret = tdb_change_int32_atomic(pwd_tdb, "RID_COUNTER", &user_rid, RID_MULTIPLIER);
                        if (tdb_ret == -1) {
                                ret = False;
                                goto done;
                        }
+                       pdb_set_user_rid(newpwd, user_rid);
+               } 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 (!(group_rid = pdb_get_group_rid(newpwd))) {
-               if (!tdb_state->permit_non_unix_accounts) {
+       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_rid(newpwd, DOMAIN_GROUP_RID_USERS);
+                       }
+               } 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;
-               } else {
-                       /* This seems like a good default choice for non-unix users */
-                       group_rid = DOMAIN_GROUP_RID_USERS;
                }
        }
 
        /* copy the SAM_ACCOUNT struct into a BYTE buffer for storage */
-       if ((data.dsize=init_buffer_from_sam (tdb_state, &buf, newpwd, user_rid, group_rid)) == -1) {
+       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"));
                ret = False;
                goto done;
@@ -770,18 +823,18 @@ done:
  Modifies an existing SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL tdbsam_update_sam_account (struct pdb_context *context, const SAM_ACCOUNT *newpwd)
+static BOOL tdbsam_update_sam_account (struct pdb_methods *my_methods, const SAM_ACCOUNT *newpwd)
 {
-       return (tdb_update_sam(context, newpwd, TDB_MODIFY));
+       return (tdb_update_sam(my_methods, newpwd, TDB_MODIFY));
 }
 
 /***************************************************************************
  Adds an existing SAM_ACCOUNT
 ****************************************************************************/
 
-static BOOL tdbsam_add_sam_account (struct pdb_context *context, const SAM_ACCOUNT *newpwd)
+static BOOL tdbsam_add_sam_account (struct pdb_methods *my_methods, const SAM_ACCOUNT *newpwd)
 {
-       return (tdb_update_sam(context, newpwd, TDB_INSERT));
+       return (tdb_update_sam(my_methods, newpwd, TDB_INSERT));
 }
 
 static void free_private_data(void **vp) 
@@ -803,6 +856,8 @@ NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
                return nt_status;
        }
 
+       (*pdb_method)->name = "tdbsam";
+
        (*pdb_method)->setsampwent = tdbsam_setsampwent;
        (*pdb_method)->endsampwent = tdbsam_endsampwent;
        (*pdb_method)->getsampwent = tdbsam_getsampwent;
@@ -812,8 +867,6 @@ NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
        (*pdb_method)->update_sam_account = tdbsam_update_sam_account;
        (*pdb_method)->delete_sam_account = tdbsam_delete_sam_account;
 
-       /* TODO: Setup private data and free */
-
        tdb_state = talloc_zero(pdb_context->mem_ctx, sizeof(struct tdbsam_privates));
 
        if (!tdb_state) {
@@ -826,7 +879,8 @@ NTSTATUS pdb_init_tdbsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, con
        } else {
                pstring tdbfile;
                get_private_directory(tdbfile);
-               pstrcat (tdbfile, PASSDB_FILE_NAME);
+               pstrcat(tdbfile, "/");
+               pstrcat(tdbfile, PASSDB_FILE_NAME);
                tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
        }
 
@@ -847,6 +901,8 @@ NTSTATUS pdb_init_tdbsam_nua(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method,
                return nt_status;
        }
 
+       (*pdb_method)->name = "tdbsam_nua";
+
        tdb_state = (*pdb_method)->private_data;
        
        tdb_state->permit_non_unix_accounts = True;
@@ -856,10 +912,10 @@ NTSTATUS pdb_init_tdbsam_nua(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method,
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       tdb_state->low_nua_rid=pdb_uid_to_user_rid(low_nua_uid);
-
-       tdb_state->high_nua_rid=pdb_uid_to_user_rid(high_nua_uid);
+/*     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);
+*/
        return NT_STATUS_OK;
 }