Changeset 752 for trunk/server/lib/tdb/common/open.c

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/tdb/common/open.c (modified) (4 diffs)

trunk/server/lib/tdb/common/open.c

@@ -328 +328 @@
             (!tdb->read_only) ) {
 #endif
-                open_flags |= O_CREAT;
-                if (ftruncate(tdb->fd, 0) == -1) {
+                int ret;
+                ret = tdb_brlock(tdb, F_WRLCK, FREELIST_TOP, 0,
+                                TDB_LOCK_WAIT);
+                if (ret == -1) {
                         TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
-                                 "failed to truncate %s: %s\n",
-                                 name, strerror(errno)));
-                        goto fail; /* errno set by ftruncate */
+                                "tdb_brlock failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
+                }
+                ret = tdb_new_database(tdb, hash_size);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "tdb_new_database failed for %s: %s\n",
+                                name, strerror(errno)));
+                        tdb_unlockall(tdb);
+                        goto fail;
+                }
+                ret = tdb_brunlock(tdb, F_WRLCK, FREELIST_TOP, 0);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "tdb_unlockall failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
+                }
+                ret = lseek(tdb->fd, 0, SEEK_SET);
+                if (ret == -1) {
+                        TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+                                "lseek failed for %s: %s\n",
+                                name, strerror(errno)));
+                        goto fail;
                 }
         }
@@ -412 +436 @@
                         goto fail;
                 }
+
 #endif
         }
@@ -543 +568 @@
         }
         SAFE_FREE(tdb->lockrecs);
+
 #ifdef __OS2__
         DosCloseMutexSem( tdb->hGlobalLock);
@@ -551 +577 @@
         tdb->hTransactionLock = 0;
 #endif
-
         /* Remove from contexts list */
         for (i = &tdbs; *i; i = &(*i)->next) {