Changeset 165 for branches/samba-3.0/source/tdb/common/open.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/tdb/common/open.c (modified) (3 diffs)

branches/samba-3.0/source/tdb/common/open.c

@@ -364 +364 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
+#ifndef __OS2__
+        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
+                goto fail;
+#endif
         tdb->next = tdbs;
         tdbs = tdb;
@@ -370 +374 @@
  fail:
         { int save_errno = errno;
-        tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
         if (!tdb)
@@ -555 +558 @@
         if ((tdb->flags & TDB_CLEAR_IF_FIRST) && 
             (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_RDLCK, F_SETLKW, 0, 1) == -1)) {
-// YD sem handle was wrong, testme #ifndef __OS2__ // PS 20070511 hack for WINS server crash
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_reopen: failed to obtain active lock\n"));
                 goto fail;
-//#endif
         }
         if (fstat(tdb->fd, &st) != 0) {