[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3232-g601c7ea

Jeremy Allison jra at samba.org
Thu Dec 4 23:34:33 GMT 2008


The branch, v3-2-test has been updated
       via  601c7eabfdb3d2725849669dda58de6db22d9b8f (commit)
      from  a1e4637922a565278cceac7b2fe95f82ad049f4a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 601c7eabfdb3d2725849669dda58de6db22d9b8f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 4 15:33:27 2008 -0800

    Fix bug #5937 - filenames with "*" char hide other files
    Jeremy.

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

Summary of changes:
 source/smbd/trans2.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index cb7cad1..ebf448f 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1080,15 +1080,13 @@ static bool exact_match(connection_struct *conn,
 {
 	if (mask[0] == '.' && mask[1] == 0)
 		return False;
-	if (conn->case_sensitive)
-		return strcmp(str,mask)==0;
-	if (StrCaseCmp(str,mask) != 0) {
-		return False;
-	}
 	if (dptr_has_wild(conn->dirptr)) {
 		return False;
 	}
-	return True;
+	if (conn->case_sensitive)
+		return strcmp(str,mask)==0;
+	else
+		return StrCaseCmp(str,mask) == 0;
 }
 
 /****************************************************************************


-- 
Samba Shared Repository


More information about the samba-cvs mailing list