Changeset 273

Timestamp:

Jun 17, 2009, 10:55:22 AM (16 years ago)

Author:

Silvan Scherrer

Message:

mutex lock fix

Location:

branches/samba-3.3.x/source

Files:

• lib/tdb/common/open.c (modified) (7 diffs)
• nmbd/nmbd.c (modified) (2 diffs)

branches/samba-3.3.x/source/lib/tdb/common/open.c ¶

@@ -27 +27 @@
 
 #include "tdb_private.h"
+
+#ifdef __OS2__
+// nmbd.c sets it to 1
+int global_Sem32Add = 0;
+#endif
 
 /* all contexts, to ensure no double-opens (fcntl locks don't nest!) */
@@ -183 +188 @@
                 // extract path info
                 _splitpath( name, drive, dir, fname, ext);
-                sprintf( szSem, "\\SEM32\\TDB_GL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_GL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hGlobalLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)
@@ -193 +198 @@
                 }
                 TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_open_ex pid %d global handle %d\n", getpid(), tdb->hGlobalLock));
-                sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hActiveLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)
@@ -203 +208 @@
                 }
                 TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_open_ex pid %d active handle %d\n", getpid(), tdb->hActiveLock));
-                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hTransactionLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)
@@ -508 +513 @@
                 // extract path info
                 _splitpath( tdb->name, drive, dir, fname, ext);
-                sprintf( szSem, "\\SEM32\\TDB_GL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_GL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hGlobalLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)
@@ -518 +523 @@
                 }
                 TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_reopen pid %d global handle %d\n", getpid(), tdb->hGlobalLock));
-                sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hActiveLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)
@@ -528 +533 @@
                 }
                 TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_reopen pid %d active handle %d\n", getpid(), tdb->hActiveLock));
-                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s", dir, fname, ext);
+                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
                 rc = DosCreateMutexSem( szSem, &tdb->hTransactionLock, 0, FALSE);
                 if (rc == ERROR_DUPLICATE_NAME)

branches/samba-3.3.x/source/nmbd/nmbd.c ¶

@@ -29 +29 @@
 extern bool rescan_listen_set;
 extern bool global_in_nmbd;
+
+#ifdef __OS2__
+extern int global_Sem32Add;
+#endif
 
 extern bool override_logfile;
@@ -766 +770 @@
         TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
 
+#ifdef __OS2__
+        global_Sem32Add = 1;
+#endif
+
         load_case_tables();