DEVEL15-windows-mountpoint-is-directory-20070622

when the CIFS client requests a directory listing without directories,
do not include mount points.

(cherry picked from commit 2675d25f6955351e963ff58abfcf2ea6aefd946a)

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 32cbc08b9785cf9bc4890957f4ad0c76c15f335a..504b57b2de6c882e59f47559709eb773b9871dc2 100644 (file)
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -4517,6 +4517,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou
                          "has filetype %d", osi_LogSaveString(smb_logp, dep->name),
                           fileType);
                 if (fileType == CM_SCACHETYPE_DIRECTORY ||
+                    fileType == CM_SCACHETYPE_MOUNTPOINT ||
                     fileType == CM_SCACHETYPE_DFSLINK ||
                     fileType == CM_SCACHETYPE_INVALID)
                     osi_Log0(smb_logp, "SMB search dir skipping directory or bad link");

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 2eae3a3f6c44da8d18a91c0935ece7a081d1b791..6496aed63d249d14fde0cbd4e47d28ee659aab6f 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4447,6 +4447,7 @@ long smb_T2SearchDirSingle(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *op
 
     if (!(attribute & SMB_ATTR_DIRECTORY) &&
         (targetscp->fileType == CM_SCACHETYPE_DIRECTORY ||
+         targetscp->fileType == CM_SCACHETYPE_MOUNTPOINT ||
          targetscp->fileType == CM_SCACHETYPE_DFSLINK ||
          targetscp->fileType == CM_SCACHETYPE_INVALID)) {
 
@@ -5107,6 +5108,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
                  "has filetype %d", dep->name,
                  fileType);*/
                 if (fileType == CM_SCACHETYPE_DIRECTORY ||
+                    fileType == CM_SCACHETYPE_MOUNTPOINT ||
                     fileType == CM_SCACHETYPE_DFSLINK ||
                     fileType == CM_SCACHETYPE_INVALID)
                     osi_Log0(smb_logp, "T2 search dir skipping directory or bad link");