From: Jeffrey Altman Date: Mon, 18 Feb 2008 05:53:56 +0000 (+0000) Subject: DEVEL15-windows-share-parse-20080217 X-Git-Tag: openafs-devel-1_5_32~13 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2dfdc9f665493d3175c739a4743fdbc5c0ac9df7;p=packages%2Fo%2Fopenafs.git DEVEL15-windows-share-parse-20080217 LICENSE MIT add srvsvc and wkssvc to reserved names in smb_ShareParse. include slash in ipc$ reference in dfs referrals check. (cherry picked from commit 72da5c434c8caef0cb81523091915738e7e930ed) --- diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index acdc5d1d8..be1509f73 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -1808,6 +1808,8 @@ int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp, char *shareName, } if (_stricmp(shareName, "IPC$") == 0 || + _stricmp(shareName, "srvsvc") == 0 || + _stricmp(shareName, "wkssvc") == 0 || _stricmp(shareName, SMB_IOCTL_FILENAME_NOSLASH) == 0 || _stricmp(shareName, "DESKTOP.INI") == 0 ) { diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index 165d3740d..f85ba5892 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -2158,7 +2158,7 @@ long smb_ReceiveTran2Open(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *op) (stricmp(lastNamep, SMB_IOCTL_FILENAME) == 0 || stricmp(lastNamep, "\\srvsvc") == 0 || stricmp(lastNamep, "\\wkssvc") == 0 || - stricmp(lastNamep, "ipc$") == 0)) { + stricmp(lastNamep, "\\ipc$") == 0)) { /* special case magic file name for receiving IOCTL requests * (since IOCTL calls themselves aren't getting through). */