Server-side fix for CORE-1820.

FirebirdSQL · Apr 4, 2008 · 1c343cb · 1c343cb
1 parent ac730b4
commit 1c343cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/remote/os/win32/srvr_w32.cpp b/src/remote/os/win32/srvr_w32.cpp
@@ -201,9 +201,12 @@ int WINAPI WinMain(HINSTANCE	hThisInst,
 	}
 #endif
 
-/* Initialize the service and
-   Setup sig_mutex for the process
-*/
+	Firebird::string mutex_name;
+	mutex_name.printf(SERVER_MUTEX, instance);
+	CreateMutex(ISC_get_security_desc(), FALSE, mutex_name.c_str());
+
+	// Initialize the service
+
 	ISC_signal_init();
 	ISC_enter();
 

diff --git a/src/utilities/install/install_nt.h b/src/utilities/install/install_nt.h
@@ -35,6 +35,7 @@ static const char* const ISCGUARD_DISPLAY_NAME	= "Firebird Guardian - %s";
 static const char* const ISCGUARD_DISPLAY_DESCR	= "Firebird Server Guardian - www.firebirdsql.org";
 static const char* const ISCGUARD_EXECUTABLE	= "bin\\fbguard";
 
+static const char* const SERVER_MUTEX			= "FirebirdServerMutex%s";
 static const char* const GUARDIAN_MUTEX			= "FirebirdGuardianMutex%s";
 
 static const char* const FB_DEFAULT_INSTANCE	= "DefaultInstance";