Changeset 234 for branches/samba-3.2.x/source/passdb

Timestamp:

May 27, 2009, 11:59:40 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.10

File:

• branches/samba-3.2.x/source/passdb/pdb_tdb.c (modified) (3 diffs)

branches/samba-3.2.x/source/passdb/pdb_tdb.c

@@ -881 +881 @@
         }
 
+        /* be sure to close the DBs _before_ renaming the file */
+
+        TALLOC_FREE(orig_db);
+        TALLOC_FREE(tmp_db);
+
         /* This is safe from other users as we know we're
          * under a mutex here. */
@@ -893 +898 @@
 
         TALLOC_FREE(frame);
-        TALLOC_FREE(orig_db);
+
+        /* re-open the converted TDB */
+
+        orig_db = db_open_trans(NULL, dbname, 0,
+                                TDB_DEFAULT, O_CREAT|O_RDWR, 0600);
+        if (orig_db == NULL) {
+                DEBUG(0, ("tdbsam_convert_backup: Failed to re-open "
+                          "converted passdb TDB [%s]\n", dbname));
+                return false;
+        }
 
         DEBUG(1, ("tdbsam_convert_backup: updated %s file.\n",
@@ -899 +913 @@
 
         /* Replace the global db pointer. */
-        *pp_db = tmp_db;
+        *pp_db = orig_db;
         return true;