windows-unused-var-20080528

[openafs.git] / src / WINNT / afsd / afsd_init.c

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 7e640e6..bef18a1 100644 (file)
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -81,7 +81,6 @@ unsigned short cm_callbackport = CM_DEFAULT_CALLBACKPORT;
 char cm_NetbiosName[MAX_NB_NAME_LENGTH] = "";
 
 char cm_CachePath[MAX_PATH];
-DWORD cm_CachePathLen;
 DWORD cm_ValidateCache = 1;
 
 BOOL reportSessionStartups = FALSE;
@@ -300,7 +299,7 @@ configureBackConnectionHostNames(void)
                     (pName - pHostNames < dwSize) && *pName ; 
                     pName += strlen(pName) + 1)
                {
-                   if ( !stricmp(pName, cm_NetbiosName) ) {
+                   if ( !cm_stricmp_utf8(pName, cm_NetbiosName) ) {
                        bNameFound = TRUE;
                        break;
                    }   
@@ -554,6 +553,7 @@ int afsd_InitCM(char **reasonP)
     long logChunkSize;
     DWORD stats;
     DWORD volumes;
+    DWORD cells;
     DWORD dwValue;
     DWORD rx_enable_peer_stats;
     DWORD rx_enable_process_stats;
@@ -779,7 +779,7 @@ int afsd_InitCM(char **reasonP)
     }
 
     dummyLen = sizeof(volumes);
-    code = RegQueryValueEx(parmKey, "Volumess", NULL, NULL,
+    code = RegQueryValueEx(parmKey, "Volumes", NULL, NULL,
                             (BYTE *) &volumes, &dummyLen);
     if (code == ERROR_SUCCESS)
         afsi_log("Volumes cache entries: %d", volumes);
@@ -788,6 +788,16 @@ int afsd_InitCM(char **reasonP)
         afsi_log("Default volume cache entries: %d", volumes);
     }
 
+    dummyLen = sizeof(cells);
+    code = RegQueryValueEx(parmKey, "Cells", NULL, NULL,
+                            (BYTE *) &cells, &dummyLen);
+    if (code == ERROR_SUCCESS)
+        afsi_log("Cell cache entries: %d", cells);
+    else {
+        cells = CM_CONFIGDEFAULT_CELLS;
+        afsi_log("Default cell cache entries: %d", cells);
+    }
+
     dummyLen = sizeof(ltt);
     code = RegQueryValueEx(parmKey, "LogoffTokenTransfer", NULL, NULL,
                             (BYTE *) &ltt, &dummyLen);
@@ -984,6 +994,15 @@ int afsd_InitCM(char **reasonP)
     }
 #endif /* AFS_FREELANCE_CLIENT */
 
+    dummyLen = sizeof(smb_UseUnicode);
+    code = RegQueryValueEx(parmKey, "NegotiateUnicode", NULL, NULL,
+                           (BYTE *) &smb_UseUnicode, &dummyLen);
+    if (code != ERROR_SUCCESS) {
+        smb_UseUnicode = 1; /* default on */
+    }
+    afsi_log("SMB Server Unicode Support is %s",
+              smb_UseUnicode ? "enabled" : "disabled");
+
     dummyLen = sizeof(smb_hideDotFiles);
     code = RegQueryValueEx(parmKey, "HideDotFiles", NULL, NULL,
                            (BYTE *) &smb_hideDotFiles, &dummyLen);
@@ -1232,7 +1251,9 @@ int afsd_InitCM(char **reasonP)
         
     cm_InitCallback();
 
-    code = cm_InitMappedMemory(virtualCache, cm_CachePath, stats, cm_chunkSize, cacheBlocks, blockSize);
+    cm_InitNormalization();
+
+    code = cm_InitMappedMemory(virtualCache, cm_CachePath, stats, volumes, cells, cm_chunkSize, cacheBlocks, blockSize);
     afsi_log("cm_InitMappedMemory code %x", code);
     if (code != 0) {
         *reasonP = "error initializing cache file";
@@ -1765,7 +1786,9 @@ LONG __stdcall afsd_ExceptionFilter(EXCEPTION_POINTERS *ep)
   
 void afsd_SetUnhandledExceptionFilter()
 {
+#ifndef NOTRACE
     SetUnhandledExceptionFilter(afsd_ExceptionFilter);
+#endif
 }
   
 #ifdef _DEBUG