Changeset 745 for trunk/server/lib/tdb/tools/tdbbackup.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/tools/tdbbackup.c (modified) (2 diffs)

trunk/server/lib/tdb/tools/tdbbackup.c

@@ -153 +153 @@
         }
 
-        if (tdb_transaction_start(tdb_new) != 0) {
-                printf("Failed to start transaction on new tdb\n");
+        /* lock the backup tdb so that nobody else can change it */
+        if (tdb_lockall(tdb_new) != 0) {
+                printf("Failed to lock backup tdb\n");
                 tdb_close(tdb);
                 tdb_close(tdb_new);
@@ -178 +179 @@
         tdb_close(tdb);
 
-        if (tdb_transaction_commit(tdb_new) != 0) {
-                fprintf(stderr, "Failed to commit new tdb\n");
-                tdb_close(tdb_new);
-                unlink(tmp_name);
-                free(tmp_name);         
-                return 1;
+        /* copy done, unlock the backup tdb */
+        tdb_unlockall(tdb_new);
+
+#ifdef HAVE_FDATASYNC
+        if (fdatasync(tdb_fd(tdb_new)) != 0) {
+#else
+        if (fsync(tdb_fd(tdb_new)) != 0) {
+#endif
+                /* not fatal */
+                fprintf(stderr, "failed to fsync backup file\n");
         }