From b210bbb4ac1fe5d3346a6892642b38e596dcdbfa Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 22 Jun 2007 06:32:10 +0000 Subject: [PATCH] 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) --- src/WINNT/afsd/smb.c | 1 + src/WINNT/afsd/smb3.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 32cbc08b9..504b57b2d 100644 --- 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 2eae3a3f6..6496aed63 100644 --- 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"); -- 2.39.5