Changeset 862 for trunk/server/lib/tdb/common/lock.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

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

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

@@ -52 +52 @@
         int lockFile = 0;
 
-        if (off == ACTIVE_LOCK)
+        if (off == ACTIVE_LOCK || off == OPEN_LOCK || off == TRANSACTION_LOCK)
                 lockFile = tdb->hActiveLock;
         else
@@ -77 +77 @@
 
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d (rc=%d)\n",
-                tdb->fd, off, rw, len, waitflag, rc));
+                lockFile, off, rw, len, waitflag, rc));
 
         return rc;
@@ -162 +162 @@
         int rc = 0;
         int lockFile = 0;
-        if (off == ACTIVE_LOCK)
+        if (off == ACTIVE_LOCK || off == OPEN_LOCK || off == TRANSACTION_LOCK)
                 lockFile = tdb->hActiveLock;
         else
@@ -182 +182 @@
 
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock: (fd=%d) offset=%lld rw_type=%d len=%lld (rc=%d)\n",
-                 tdb->fd, off, rw, len, rc));
+                 lockFile, off, rw, len, rc));
 
         return rc;