STABLE14-windows-longfilename-matching-20050203

retry pattern matching when ambiguous matches are found for long file
names

(cherry picked from commit d5495f26ec6e02bc09ad0d6ee6a9a62f545bfd9c)

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 73844a4dda3032153df609d1be0d1f3a33683d1e..c37ddf9af35bb88c374993243ccbadcd5c3499b2 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4127,8 +4127,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
                 bytesInBuffer++;
             }
         }      /* if we're including this name */
-        else if (!NeedShortName &&
-                 !starPattern &&
+        else if (!starPattern &&
                  !foundInexact &&
                  dep->fid.vnode != 0 &&
                  smb_V3MatchMask(dep->name, maskp, CM_FLAG_CASEFOLD)) {