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.

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 32b77270e68a45e2866287441b427e6f3bd4c063..ef61883318d8241ce4beb44ea335c06b759c32a0 100644 (file)
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -1644,6 +1644,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 b81e594394ce3a707706c4010f6fab22ee5c4264..a30877d16bfd0916d0045ded51b2a403d203bd76 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -2152,7 +2152,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).
          */