source3/passdb/pdb_tdb.c: convert to dbwrap.

Access winbindd_idmap.tdb via dbwrap.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 8b923d6cd807fa08a55982c49520b5b1a276d33b..3a26ecdc73262096cc99657b51e6c7288ded9fec 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -324,9 +324,8 @@ static bool tdbsam_convert_backup(const char *dbname, struct db_context **pp_db)
 
 static bool tdbsam_upgrade_next_rid(struct db_context *db)
 {
-       TDB_CONTEXT *tdb;
+       struct db_context *db2;
        uint32 rid;
-       bool ok = false;
        NTSTATUS status;
 
        status = dbwrap_fetch_uint32_bystring(db, NEXT_RID_STRING, &rid);
@@ -334,15 +333,15 @@ static bool tdbsam_upgrade_next_rid(struct db_context *db)
                return true;
        }
 
-       tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0,
-                          TDB_DEFAULT, O_RDONLY, 0644);
+       db2 = db_s3open(db, state_path("winbindd_idmap.tdb"), 0,
+                       TDB_DEFAULT, O_RDONLY, 0644);
 
-       if (tdb) {
-               ok = tdb_fetch_uint32(tdb, "RID_COUNTER", &rid);
-               if (!ok) {
+       if (db2) {
+               status = dbwrap_fetch_uint32_bystring(db2, "RID_COUNTER", &rid);
+               if (!NT_STATUS_IS_OK(status)) {
                        rid = BASE_RID;
                }
-               tdb_close(tdb);
+               talloc_free(db2);
        } else {
                rid = BASE_RID;
        }