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 acdc5d1d8f0ace7cb5cffb1b95e93b189b8ad8be..be1509f73a50c64cfc362acbddb751fbbdbe17bc 100644 (file)
--- 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 165d3740d8fc4f7c819123a74680a9c683ff3092..f85ba5892118839453f525eb601c0377640ffd8e 100644 (file)
--- 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).
          */