jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: afsredir only wants shortName if not 8.3

Browse Source 
When performing a directory enumeration for the afs redirector
only specify a shortname if the name is not valid 8.3.

Change-Id: I650be75b9ea8e41721272cd8bd426f1989ca01fb
Reviewed-on: http://gerrit.openafs.org/5727
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
This commit is contained in:
Jeffrey Altman 2011-10-24 21:14:59 -04:00 committed by Jeffrey Altman
parent 219624206d
commit 61b04b19ad
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WINNT/afsrdr/user/RDRFunction.c
View File

@ -861,7 +861,8 @@ RDR_EnumerateDirectory( IN cm_user_t *userp,
if (scp) { if (scp) {
code = RDR_PopulateCurrentEntry(pCurrentEntry, dwMaxEntryLength, code = RDR_PopulateCurrentEntry(pCurrentEntry, dwMaxEntryLength,
dscp, scp, userp, &req, dscp, scp, userp, &req,
entryp->name, entryp->shortName, entryp->name,
cm_Is8Dot3(entryp->name) ? NULL : entryp->shortName,
(bWow64 ? RDR_POP_WOW64 : 0) | (bWow64 ? RDR_POP_WOW64 : 0) |
(bSkipStatus ? RDR_POP_NO_GETSTATUS : 0), (bSkipStatus ? RDR_POP_NO_GETSTATUS : 0),
&pCurrentEntry, &dwMaxEntryLength); &pCurrentEntry, &dwMaxEntryLength);
@ -869,7 +870,8 @@ RDR_EnumerateDirectory( IN cm_user_t *userp,
} else { } else {
code = RDR_PopulateCurrentEntryNoScp( pCurrentEntry, dwMaxEntryLength, code = RDR_PopulateCurrentEntryNoScp( pCurrentEntry, dwMaxEntryLength,
dscp, &entryp->fid, userp, &req, dscp, &entryp->fid, userp, &req,
entryp->name, entryp->shortName, entryp->name,
cm_Is8Dot3(entryp->name) ? NULL : entryp->shortName,
(bWow64 ? RDR_POP_WOW64 : 0), (bWow64 ? RDR_POP_WOW64 : 0),
&pCurrentEntry, &dwMaxEntryLength); &pCurrentEntry, &dwMaxEntryLength);
} }
@ -1385,6 +1387,7 @@ RDR_CreateFileEntry( IN cm_user_t *userp,
cm_Gen8Dot3NameIntW(FileName, &dfid, shortName, NULL); cm_Gen8Dot3NameIntW(FileName, &dfid, shortName, NULL);
else else
shortName[0] = '\0'; shortName[0] = '\0';
code = RDR_PopulateCurrentEntry(&pResultCB->DirEnum, dwRemaining, code = RDR_PopulateCurrentEntry(&pResultCB->DirEnum, dwRemaining,
dscp, scp, userp, &req, FileName, shortName, dscp, scp, userp, &req, FileName, shortName,
RDR_POP_FOLLOW_MOUNTPOINTS | RDR_POP_EVALUATE_SYMLINKS, RDR_POP_FOLLOW_MOUNTPOINTS | RDR_POP_EVALUATE_SYMLINKS,
@ -2303,6 +2306,7 @@ RDR_RenameFileEntry( IN cm_user_t *userp,
cm_Gen8Dot3NameIntW(TargetFileName, &dfid, shortName, NULL); cm_Gen8Dot3NameIntW(TargetFileName, &dfid, shortName, NULL);
else else
shortName[0] = '\0'; shortName[0] = '\0';
RDR_PopulateCurrentEntry(&pResultCB->DirEnum, dwRemaining, RDR_PopulateCurrentEntry(&pResultCB->DirEnum, dwRemaining,
newDscp, scp, userp, &req, TargetFileName, shortName, newDscp, scp, userp, &req, TargetFileName, shortName,
RDR_POP_FOLLOW_MOUNTPOINTS | RDR_POP_EVALUATE_SYMLINKS, RDR_POP_FOLLOW_MOUNTPOINTS | RDR_POP_EVALUATE_SYMLINKS,