docs: fix a typo in history file

[bbaumbach/samba-autobuild/.git] / source3 / passdb / pdb_tdb.c

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 067150334a35af0651727f9c564621f23edda8c6..161030fed8b9aba4096a75f9191b6e9998b25a94 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -30,6 +30,8 @@
 #include "../libcli/security/security.h"
 #include "util_tdb.h"
 #include "passdb/pdb_tdb.h"
+#include "lib/util/smb_strtox.h"
+#include "lib/util/string_wrappers.h"
 
 #if 0 /* when made a module use this */
 
@@ -715,7 +717,7 @@ static bool tdb_delete_samacct_only( struct samu *sam_pass )
 static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods,
                                          struct samu *sam_pass)
 {
-       NTSTATUS        nt_status = NT_STATUS_UNSUCCESSFUL;
+       NTSTATUS        nt_status;
        fstring         keystr;
        uint32_t        rid;
        fstring         name;
@@ -1001,6 +1003,8 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
                                          struct samu *old_acct,
                                          const char *newname)
 {
+       const struct loadparm_substitution *lp_sub =
+               loadparm_s3_global_substitution();
        struct samu      *new_acct = NULL;
        char *rename_script = NULL;
        int              rename_ret;
@@ -1013,7 +1017,7 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods,
                return NT_STATUS_NO_MEMORY;
        }
 
-       rename_script = lp_rename_user_script(new_acct);
+       rename_script = lp_rename_user_script(new_acct, lp_sub);
        if (!rename_script) {
                TALLOC_FREE(new_acct);
                return NT_STATUS_NO_MEMORY;
@@ -1183,7 +1187,11 @@ static int tdbsam_collect_rids(struct db_record *rec, void *private_data)
                return 0;
        }
 
-       rid = strtoul_err((char *)key.dptr+prefixlen, NULL, 16, &error);
+       rid = smb_strtoul((char *)key.dptr+prefixlen,
+                         NULL,
+                         16,
+                         &error,
+                         SMB_STR_STANDARD);
        if (error != 0) {
                return 0;
        }