[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-880-g8e419aa

[Stefan Metzmacher]

The branch, master has been updated
       via  8e419aab48ace1fe0d075e2a25935e650805a23c (commit)
      from  5b50e506d010c0c3fc15c1ecaef7aa9e5383691c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8e419aab48ace1fe0d075e2a25935e650805a23c
Author: Stefan Metzmacher <metze@xxxxxxxxx>
Date:   Thu Aug 6 21:16:38 2009 +0200

    s3:smbd: don't ignore check_descend in get_dir_entry()
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/dir.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 642fb09..7acd349 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -875,6 +875,7 @@ bool get_dir_entry(TALLOC_CTX *ctx,
                if ((strcmp(mask,"*.*") == 0) ||
                    mask_match_search(filename,mask,False) ||
                    mangle_mask_match(conn,filename,mask)) {
+                       bool isdots = (ISDOT(dname) || ISDOTDOT(dname));
                        char mname[13];
                        struct smb_filename *smb_fname = NULL;
                        NTSTATUS status;
@@ -891,6 +892,11 @@ bool get_dir_entry(TALLOC_CTX *ctx,
                                }
                        }
 
+                       if (check_descend && !isdots) {
+                               TALLOC_FREE(filename);
+                               continue;
+                       }
+
                        if (needslash) {
                                pathreal = talloc_asprintf(ctx,
                                                "%s/%s",


-- 
Samba Shared Repository