Changeset 657

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Correct previous commit

Location:

trunk/server

Files:

• lib/tdb/common/tdb_private.h (modified) (1 diff)
• lib/tdb/common/transaction.c (modified) (7 diffs)
• source3/passdb/pdb_tdb.c (modified) (8 diffs)

trunk/server/lib/tdb/common/tdb_private.h ¶

@@ -38 +38 @@
 #include "tdb.h"
 
-#define TDB_TRACE 1
+/* #define TDB_TRACE 1 */
 #ifndef HAVE_GETPAGESIZE
 #define getpagesize() 0x2000

trunk/server/lib/tdb/common/transaction.c ¶

@@ -1020 +1020 @@
 
         tdb_trace(tdb, "tdb_transaction_commit");
-        tdb_trace(tdb, "@todo: tdb_transaction_error");
         if (tdb->transaction->transaction_error) {
                 tdb->ecode = TDB_ERR_IO;
@@ -1028 +1027 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_transaction_nesting");
         if (tdb->transaction->nesting != 0) {
                 tdb->transaction->nesting--;
@@ -1034 +1032 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_null_transaction");
         /* check for a null transaction */
         if (tdb->transaction->blocks == NULL) {
@@ -1041 +1038 @@
         }
 
-        tdb_trace(tdb, "@todo: tdb_transaction_prepare");
         if (!tdb->transaction->prepared) {
                 int ret = _tdb_transaction_prepare_commit(tdb);
@@ -1049 +1045 @@
 
         methods = tdb->transaction->io_methods;
-
-        tdb_trace(tdb, "@todo: tdb_transaction perform all the writes");
 
         /* perform all the writes */
@@ -1086 +1080 @@
         tdb->transaction->num_blocks = 0;
 
-        tdb_trace(tdb, "@todo: tdb_transaction ensure the new data is on disk");
         /* ensure the new data is on disk */
         if (transaction_sync(tdb, 0, tdb->map_size) == -1) {
@@ -1104 +1097 @@
            mtime changes when a transaction completes */
 #ifdef HAVE_UTIME
-    tdb_trace(tdb, "@todo: tdb_transaction utime");
         utime(tdb->name, NULL);
 #endif
 
-    tdb_trace(tdb, "@todo: tdb_transaction need repack");
         need_repack = tdb->transaction->need_repack;
 
         /* use a transaction cancel to free memory and remove the
            transaction locks */
-    tdb_trace(tdb, "@todo: tdb_transaction cancel");
         _tdb_transaction_cancel(tdb);
 
         if (need_repack) {
-            tdb_trace(tdb, "@todo: tdb_transaction repack");
                 return tdb_repack(tdb);
         }

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");