STABLE14-windows-afsd-20070105

some of the patches from the last few months that were pulled up
rely on bits and pieces from other patches that weren't pulled up.

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 2f040a9dc23e4748da7498623eb100d61845055c..c83b548b8a1e7a19e49dc155b47ef1cbb5de8935 100644 (file)
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -561,6 +561,7 @@ int afsd_InitCM(char **reasonP)
     char buf[1024];
     HKEY parmKey;
     DWORD dummyLen;
+    DWORD dwValue;
     DWORD regType;
     long code;
     /*int freelanceEnabled;*/

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index 1446b60854487d5f295a412281d1f6e8ecd5cfcd..459d5e8c7f91f3119703c16acd7d3b9ad7aeead4 100644 (file)
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -80,9 +80,7 @@ BOOLEAN APIENTRY DllEntryPoint(HANDLE dll, DWORD reason, PVOID reserved)
     switch (reason) {
     case DLL_PROCESS_ATTACH:
         /* Initialization Mutex */
-       if (!bInitMutex) {
-           hInitMutex = CreateMutex(NULL, FALSE, NULL);
-       }
+       hInitMutex = CreateMutex(NULL, FALSE, NULL);
 
        WSAStartup( MAKEWORD(2,2), &wsaData );
         break;