[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  f249d2d... Fix bug #6939 - mangling method = hash breaks long filenames.
      from  b53ee9f... Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dial

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


- Log -----------------------------------------------------------------
commit f249d2d5893a3f8494e43fd1a805c78cee8eeec5
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 17 16:36:53 2009 -0800

    Fix bug #6939 - mangling method = hash breaks long filenames.
    
    We were returning the wrong sense of the bool. must_mangle()
    has to return !NT_STATUS_IS_OK, not NT_STATUS_IS_OK.
    
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/mangle_hash.c b/source/smbd/mangle_hash.c
index 69ecf77..5de69e2 100644
--- a/source/smbd/mangle_hash.c
+++ b/source/smbd/mangle_hash.c
@@ -613,7 +613,10 @@ static bool must_mangle(const char *name,
 	}
 	status = is_valid_name(name_ucs2, False, False);
 	SAFE_FREE(name_ucs2);
-	return NT_STATUS_IS_OK(status);
+	/* We return true if we *must* mangle, so if it's
+	 * a valid name (status == OK) then we must return
+	 * false. Bug #6939. */
+	return !NT_STATUS_IS_OK(status);
 }
 
 /*****************************************************************************


-- 
Samba Shared Repository