From 702e858526dad2dbec9564b9a60bfaaaea70c0ad Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 27 Feb 2004 06:44:46 +0000 Subject: [PATCH] nbname-instead-of-mountroot-20040227 When determining what name should be used for the NetbiosName query the registry value "NetbiosName" instead of "MountRoot". --- src/WINNT/client_config/getlana.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/WINNT/client_config/getlana.cpp b/src/WINNT/client_config/getlana.cpp index f78cc339e..635d2a2f5 100644 --- a/src/WINNT/client_config/getlana.cpp +++ b/src/WINNT/client_config/getlana.cpp @@ -394,21 +394,16 @@ void GetUncServerName(int lanaNumber, BOOL isGateway, TCHAR* name, int type) if (lanaNumber >= 0 && lana_IsLoopback(lanaNumber, msg)) { HKEY parmKey; - char mountRoot[MAX_PATH+1]; - char *pmount=mountRoot; - DWORD len=sizeof(mountRoot)-1; - printf("int mountroot \n"); + char explicitNetbiosName[MAX_PATH+1]; + DWORD len=sizeof(explicitNetbiosName)-1; if ((RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSCONFIGKEYNAME,0, KEY_QUERY_VALUE, &parmKey)!= ERROR_SUCCESS) - || (RegQueryValueEx(parmKey, "Mountroot", NULL, NULL,(LPBYTE)(mountRoot), &len)!= ERROR_SUCCESS) - || (len > sizeof(mountRoot)-1) + || (RegQueryValueEx(parmKey, "NetbiosName", NULL, NULL,(LPBYTE)(explicitNetbiosName), &len)!= ERROR_SUCCESS) + || (len > sizeof(explicitNetbiosName)-1) ) - strcpy(mountRoot, "afs"); + strcpy(explicitNetbiosName, "AFS"); RegCloseKey(parmKey); - mountRoot[len]=0; /*safety see ms-help://MS.MSDNQTR.2002OCT.1033/sysinfo/base/regqueryvalueex.htm*/ - if ((*pmount=='/') || (*pmount=='\\')) - pmount++; - - _tcscpy(name, pmount); + explicitNetbiosName[len]=0; /*safety see ms-help://MS.MSDNQTR.2002OCT.1033/sysinfo/base/regqueryvalueex.htm*/ + _tcscpy(name, explicitNetbiosName); } else { gethostname(cm_HostName, sizeof(cm_HostName)); _tcscpy(tmpName, cm_HostName); -- 2.39.5