Changeset 647

Timestamp:

Nov 2, 2011, 7:24:23 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: prevent internal locks, fixes ticket:173 and ticket:140

Location:

trunk/server/lib/tdb/common

Files:

• lock.c (modified) (4 diffs)
• tdb.c (modified) (7 diffs)
• traverse.c (modified) (1 diff)

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

@@ -139 +139 @@
         ULONG       fAccess = 0;
         int         fLock = 0;
-        ULONG       ulTimeout;
         off_t       cbFile;
         off_t       offStart;
@@ -146 +145 @@
         TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
                 getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len));
+
+        if (tdb->flags & TDB_NOLOCK) {
+                return 0;
+        }
+
+        if ((rw_type == F_WRLCK) && (tdb->read_only || tdb->traverse_read)) {
+                tdb->ecode = TDB_ERR_RDONLY;
+                return -1;
+        }
         
         switch( offset) {
@@ -152 +160 @@
         case TRANSACTION_LOCK:
                 return _mutex_brlock( tdb, offset, rw_type,  lck_type,  probe, len);
-        }
-
-        if (tdb->flags & TDB_NOLOCK) {
-                return 0;
-        }
-
-        if ((rw_type == F_WRLCK) && (tdb->read_only || tdb->traverse_read)) {
-                tdb->ecode = TDB_ERR_RDONLY;
-                return -1;
         }
 
@@ -178 +177 @@
                         break;
         }
-        
-        if (lck_type == F_SETLKW)
-                ulTimeout = SEM_INDEFINITE_WAIT;
-        else
-                ulTimeout = SEM_IMMEDIATE_RETURN;
-        
+                
         FILELOCK   aflock[2];
         bzero(&aflock[(fLock + 1) & 1], sizeof(aflock[0]));

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

@@ -923 +923 @@
 
         tdb_trace(tdb, "tdb_repack");
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: repack enter\n"));
 
         if (tdb_transaction_start(tdb) != 0) {
@@ -928 +929 @@
                 return -1;
         }
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach start\n"));
 
         tmp_db = tdb_open("tmpdb", tdb_hash_size(tdb), TDB_INTERNAL, O_RDWR|O_CREAT, 0);
@@ -935 +937 @@
                 return -1;
         }
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach tmp open\n"));
 
         state.error = false;
@@ -945 +948 @@
                 return -1;              
         }
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach travers\n"));
 
         if (state.error) {
@@ -959 +963 @@
                 return -1;
         }
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach wipe\n"));
 
         state.error = false;
@@ -969 +974 @@
                 return -1;              
         }
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach read\n"));
 
         if (state.error) {
@@ -978 +984 @@
 
         tdb_close(tmp_db);
+TDB_LOG((tdb, TDB_DEBUG_TRACE, "@remove me: nach close\n"));
 
         if (tdb_transaction_commit(tdb) != 0) {

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

@@ -216 +216 @@
                       tdb_traverse_func fn, void *private_data)
 {
+
         struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
         int ret;