ticket-6077-20040804

FIXES 6077

Patch from Joe Buehler modified by Asanka

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 96cccf00af4a52ae12a11c8e3202da302674b627..348c86dcbf23688fca0da410e78cfa3a908a8e45 100644 (file)
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -69,7 +69,7 @@ int logReady = 0;
 char cm_HostName[200];
 long cm_HostAddr;
 
-char cm_NetbiosName[MAX_NB_NAME_LENGTH];
+char cm_NetbiosName[MAX_NB_NAME_LENGTH] = "";
 
 char cm_CachePath[200];
 DWORD cm_CachePathLen;
@@ -100,8 +100,6 @@ HANDLE afsi_file;
 int cm_dnsEnabled = 1;
 #endif
 
-char cm_NetBiosName[32];
-
 extern initUpperCaseTable();
 void afsd_initUpperCaseTable() 
 {
@@ -698,21 +696,24 @@ int afsd_InitCM(char **reasonP)
        }
 #endif /* AFS_FREELANCE_CLIENT */
 
+#ifdef COMMENT
+    /* The netbios name is looked up in lana_GetUNCServerNameEx */
     dummyLen = sizeof(buf);
     code = RegQueryValueEx(parmKey, "NetbiosName", NULL, NULL,
                            (BYTE *) &buf, &dummyLen);
     if (code == ERROR_SUCCESS) {
-        DWORD len = ExpandEnvironmentStrings(buf, cm_NetBiosName, MAX_NB_NAME_LENGTH);
+        DWORD len = ExpandEnvironmentStrings(buf, cm_NetbiosName, MAX_NB_NAME_LENGTH);
         if ( len > 0 && len <= MAX_NB_NAME_LENGTH ) {
-            afsi_log("Explicit NetBios name is used %s", cm_NetBiosName);
+            afsi_log("Explicit NetBios name is used %s", cm_NetbiosName);
         } else {
             afsi_log("Unable to Expand Explicit NetBios name: %s", buf);
-            cm_NetBiosName[0] = 0;  /* turn it off */
+            cm_NetbiosName[0] = 0;  /* turn it off */
         }
     }
     else {
-        cm_NetBiosName[0] = 0;   /* default off */
+        cm_NetbiosName[0] = 0;   /* default off */
     }
+#endif
 
     dummyLen = sizeof(smb_hideDotFiles);
     code = RegQueryValueEx(parmKey, "HideDotFiles", NULL, NULL,

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index 7216f684d332a47e98fb1ac57b6214a356476aba..15feb9baab9b7efd2c76a5ef061124efbaa08d37 100644 (file)
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -853,7 +853,7 @@ VOID AFS_Logoff_Event( PWLX_NOTIFICATION_INFO pInfo )
      */
     if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) {
         WCHAR Domain[64]=L"";
-        GetLocalShortDomain(Domain);
+        GetLocalShortDomain(Domain, sizeof(Domain));
         if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, Domain))
             GetUserProfileDirectory(pInfo->hToken, profileDir, &len);
     }

diff --git a/src/WINNT/afsd/afslogon.h b/src/WINNT/afsd/afslogon.h
index dc1d4f6152a7286f2a0f07b62f1f29834da2444c..d222642f3b8022fcd72b99f64b3bfad4204b4417 100644 (file)
--- a/src/WINNT/afsd/afslogon.h
+++ b/src/WINNT/afsd/afslogon.h
@@ -120,7 +120,7 @@ void GetDomainLogonOptions( PLUID lpLogonId, char * username, char * domain, Log
 DWORD GetFileCellName(char * path, char * cell, size_t cellLen);
 DWORD GetAdHomePath(char * homePath, size_t homePathLen, PLUID lpLogonId, LogonOptions_t * opt);
 DWORD QueryAdHomePathFromSid(char * homePath, size_t homePathLen, PSID psid, PWSTR domain);
-BOOL GetLocalShortDomain(PWSTR Domain);
+BOOL GetLocalShortDomain(PWSTR Domain, DWORD cbDomain);
 
 #ifdef __cplusplus
 }

diff --git a/src/WINNT/afsd/logon_ad.cpp b/src/WINNT/afsd/logon_ad.cpp
index 6705cfa1523c5415dd3d3135231d526ee14976fe..204147150af3c81821e6df85a19b60f16b384f8b 100644 (file)
--- a/src/WINNT/afsd/logon_ad.cpp
+++ b/src/WINNT/afsd/logon_ad.cpp
@@ -244,9 +244,15 @@ DWORD QueryAdHomePathFromSid(char * homePath, size_t homePathLen, PSID psid, PWS
                     BSTR bstr;
 
                     hr = pNto->Get(ADS_NAME_TYPE_1779, &bstr);
-                    wcscpy(adsPath, bstr);
-
-                    SysFreeString(bstr);
+                    if(SUCCEEDED(hr)) {
+                        hr = StringCchCopyW(adsPath, MAX_PATH, bstr);
+                        if(FAILED(hr)) {
+                            DebugEvent("Overflow while copying ADS path");
+                            adsPath[0] = L'\0';
+                        }
+
+                        SysFreeString(bstr);
+                    }
                 }
             }
             pNto->Release();
@@ -349,7 +355,7 @@ DWORD GetAdHomePath(char * homePath, size_t homePathLen, PLUID lpLogonId, LogonO
        }
 }
 
-BOOL GetLocalShortDomain(PWSTR Domain)
+BOOL GetLocalShortDomain(PWSTR Domain, DWORD cbDomain)
 {
     HRESULT hr;
     IADsADSystemInfo *pADsys;
@@ -370,9 +376,11 @@ BOOL GetLocalShortDomain(PWSTR Domain)
 
         hr = pADsys->get_DomainShortName(&bstr);
         if ( !FAILED(hr) ) {
-            wcscpy( Domain, bstr );
+            hr = StringCbCopyW( Domain, cbDomain, bstr );
+            if(SUCCEEDED(hr)) {
+                retval = TRUE;
+            }
             SysFreeString(bstr);
-            retval = TRUE;
         }
         pADsys->Release();
     }