Changeset 456 for trunk/server/lib/tdb/common/io.c

Timestamp:

Jun 7, 2010, 9:08:40 AM (16 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changes from 3.3

File:

• trunk/server/lib/tdb/common/io.c (modified) (2 diffs)

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

@@ -90 +90 @@
                 return -1;
 
+
+
+
+
+
+
+
+
+
+
+
         if (tdb->map_ptr) {
                 memcpy(off + (char *)tdb->map_ptr, buf, len);
@@ -115 +126 @@
                                  "write %d bytes at %d in two attempts\n",
                                  len, off));
-                        return -1;
-                }
-        }
+
+#ifdef __OS2__ // remove our lock
+                        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#endif
+                        return -1;
+                }
+        }
+
+#ifdef __OS2__ // remove our lock
+        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#endif
+
         return 0;
 }