jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 21:47:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

windows-pioctl-global-auto-mapper-20081125

Browse Source 
LICENSE MIT
FIXES 123726

drive letters mapped to \\afs by the global auto mapper do not show
up as mapped drives.  Add a check for the drive mapping based upon
the registry configuration.
This commit is contained in:
Jeffrey Altman 2008-11-26 07:15:01 +00:00
parent ebb2c8eaca
commit 5697e58a07
1 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/sys/pioctl_nt.c
View File

@ -478,6 +478,32 @@ DriveIsMappedToAFS(char *drivestr, char *NetbiosName)
return bIsAFS;
}
static BOOL
DriveIsGlobalAutoMapped(char *drivestr)
{
DWORD dwResult;
HKEY hKey;
DWORD dwSubMountSize;
char szSubMount[260];
DWORD dwType;
dwResult = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
AFSREG_CLT_SVC_PARAM_SUBKEY "\\GlobalAutoMapper",
0, KEY_QUERY_VALUE, &hKey);
if (dwResult != ERROR_SUCCESS)
return FALSE;
dwSubMountSize = sizeof(szSubMount);
dwType = REG_SZ;
dwResult = RegQueryValueEx(hKey, drivestr, 0, &dwType, szSubMount, &dwSubMountSize);
RegCloseKey(hKey);
if (dwResult == ERROR_SUCCESS && dwType == REG_SZ)
return TRUE;
else
return FALSE;
}
static long
GetIoctlHandle(char *fileNamep, HANDLE * handlep)
{
@ -497,6 +523,7 @@ GetIoctlHandle(char *fileNamep, HANDLE * handlep)
DWORD gle;
DWORD dwSize = sizeof(szUser);
int saveerrno;
UINT driveType;
memset(HostName, '\0', sizeof(HostName));
gethostname(HostName, sizeof(HostName));
@ -511,22 +538,24 @@ GetIoctlHandle(char *fileNamep, HANDLE * handlep)
if (fileNamep) {
drivep = strchr(fileNamep, ':');
if (drivep && (drivep - fileNamep) >= 1) {
UINT driveType;
tbuffer[0] = *(drivep - 1);
tbuffer[1] = ':';
tbuffer[2] = '\\';
tbuffer[3] = '\0';
tbuffer[2] = '\0';
driveType = GetDriveType(tbuffer);
switch (driveType) {
case DRIVE_UNKNOWN:
case DRIVE_REMOTE:
if (DriveIsMappedToAFS(tbuffer, netbiosName))
if (DriveIsMappedToAFS(tbuffer, netbiosName) ||
DriveIsGlobalAutoMapped(tbuffer))
strcpy(&tbuffer[2], SMB_IOCTL_FILENAME);
else
return -1;
break;
default:
if (DriveIsGlobalAutoMapped(tbuffer))
strcpy(&tbuffer[2], SMB_IOCTL_FILENAME);
else
return -1;
}
} else if (fileNamep[0] == fileNamep[1] &&
@ -552,7 +581,24 @@ GetIoctlHandle(char *fileNamep, HANDLE * handlep)
if ( curdir[1] == ':' ) {
tbuffer[0] = curdir[0];
tbuffer[1] = ':';
strcpy(tbuffer + 2, SMB_IOCTL_FILENAME);
tbuffer[2] = '\0';
driveType = GetDriveType(tbuffer);
switch (driveType) {
case DRIVE_UNKNOWN:
case DRIVE_REMOTE:
if (DriveIsMappedToAFS(tbuffer, netbiosName) ||
DriveIsGlobalAutoMapped(tbuffer))
strcpy(&tbuffer[2], SMB_IOCTL_FILENAME);
else
return -1;
break;
default:
if (DriveIsGlobalAutoMapped(tbuffer))
strcpy(&tbuffer[2], SMB_IOCTL_FILENAME);
else
return -1;
}
} else if (curdir[0] == curdir[1] &&
(curdir[0] == '\\' || curdir[0] == '/'))
{