Changeset 657 for trunk/server/source3/passdb/pdb_tdb.c

Timestamp:

Nov 8, 2011, 7:01:01 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Correct previous commit

File:

• trunk/server/source3/passdb/pdb_tdb.c (modified) (8 diffs)

trunk/server/source3/passdb/pdb_tdb.c

@@ -339 +339 @@
         int ret;
 
-    DEBUG(0,("@todo: tdbsam_convert: tdbsam_convert_backup\n"));
         /* We only need the update backup for local db's. */
         if (db_is_local(name) && !tdbsam_convert_backup(name, pp_db)) {
@@ -350 +349 @@
         state.success = true;
 
-    DEBUG(0,("@todo: tdbsam_convert: transaction_start\n"));
         if (db->transaction_start(db) != 0) {
                 DEBUG(0, ("tdbsam_convert: Could not start transaction\n"));
@@ -356 +354 @@
         }
 
-    DEBUG(0,("@todo: tdbsam_convert: tdbsam_upgrade_next_rid\n"));
         if (!tdbsam_upgrade_next_rid(db)) {
                 DEBUG(0, ("tdbsam_convert: tdbsam_upgrade_next_rid failed\n"));
@@ -362 +359 @@
         }
 
-    DEBUG(0,("@todo: tdbsam_convert: traverse\n"));
         ret = db->traverse(db, tdbsam_convert_one, &state);
         if (ret < 0) {
@@ -374 +370 @@
         }
 
-    DEBUG(0,("@todo: tdbsam_convert: dbwrap_store_int32 major\n"));
         if (dbwrap_store_int32(db, TDBSAM_VERSION_STRING,
                                TDBSAM_VERSION) != 0) {
@@ -380 +375 @@
                 goto cancel;
         }
-    DEBUG(0,("@todo: tdbsam_convert: dbwrap_store_int32 minor\n"));
+
         if (dbwrap_store_int32(db, TDBSAM_MINOR_VERSION_STRING,
                                TDBSAM_MINOR_VERSION) != 0) {
@@ -387 +382 @@
         }
 
-    DEBUG(0,("@todo: tdbsam_convert: transaction_commit\n"));
         if (db->transaction_commit(db) != 0) {
                 DEBUG(0, ("tdbsam_convert: Could not commit transaction\n"));
@@ -396 +390 @@
 
  cancel:
-    DEBUG(0,("@todo: tdbsam_convert: transaction_cancel\n"));
         if (db->transaction_cancel(db) != 0) {
                 smb_panic("tdbsam_convert: transaction_cancel failed");