From b88b80f63a7b333077c6916cf4da0321e18bd565 Mon Sep 17 00:00:00 2001 From: Steve French Date: Sat, 30 Apr 2005 11:10:57 -0700 Subject: [PATCH] --- yaml --- r: 609 b: refs/heads/master c: 68575476718ed1c6d6ddafeec8310b109e7a7a7f h: refs/heads/master i: 607: 08606508ff68271c1a7849d615d636c6bb6e2dee v: v3 --- [refs] | 2 +- trunk/fs/cifs/CHANGES | 4 +++- trunk/fs/cifs/cifssmb.c | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2fe20ac0a350..f621ac41c947 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9747dd6fa98f2983f4dd09cd6dad1fa3d2a4c5f2 +refs/heads/master: 68575476718ed1c6d6ddafeec8310b109e7a7a7f diff --git a/trunk/fs/cifs/CHANGES b/trunk/fs/cifs/CHANGES index 4d2404305ab6..95483baab706 100644 --- a/trunk/fs/cifs/CHANGES +++ b/trunk/fs/cifs/CHANGES @@ -4,7 +4,9 @@ Fix error mapping of the TOO_MANY_LINKS (hardlinks) case. Do not oops if root user kills cifs oplock kernel thread or kills the cifsd thread (NB: killing the cifs kernel threads is not recommended, unmount and rmmod cifs will kill them when they are -no longer needed). +no longer needed). Fix readdir to ASCII servers (ie older servers +which do not support Unicode) and also require asterik. + Version 1.33 ------------ diff --git a/trunk/fs/cifs/cifssmb.c b/trunk/fs/cifs/cifssmb.c index b004fef0a42b..741ff0c69f37 100644 --- a/trunk/fs/cifs/cifssmb.c +++ b/trunk/fs/cifs/cifssmb.c @@ -2451,12 +2451,14 @@ CIFSFindFirst(const int xid, struct cifsTconInfo *tcon, name_len += 2; } else { /* BB add check for overrun of SMB buf BB */ name_len = strnlen(searchName, PATH_MAX); - name_len++; /* trailing null */ /* BB fix here and in unicode clause above ie if(name_len > buffersize-header) free buffer exit; BB */ strncpy(pSMB->FileName, searchName, name_len); - pSMB->FileName[name_len] = 0; /* just in case */ + pSMB->FileName[name_len] = '\\'; + pSMB->FileName[name_len+1] = '*'; + pSMB->FileName[name_len+2] = 0; + name_len += 3; } params = 12 + name_len /* includes null */ ;