[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Dec 17 17:16:06 MST 2009


The branch, master has been updated
       via  159c1b8... Fix bug #6939 - mangling method = hash breaks long filenames.
      from  bbec305... s4:"samdb_set_password" - remove delete instructions

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


- Log -----------------------------------------------------------------
commit 159c1b860aa4d61acf765c849c63e3bee9f57ad3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 17 16:14:30 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:
 source3/smbd/mangle_hash.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 94bb184..c08bc40 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -612,7 +612,10 @@ static bool must_mangle(const char *name,
 	}
 	status = is_valid_name(name_ucs2, False, False);
 	TALLOC_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


More information about the samba-cvs mailing list