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

Karolin Seeger kseeger at samba.org
Mon Dec 21 04:07:36 MST 2009


The branch, v3-4-test has been updated
       via  2f1a66a... Fix bug #6939 - mangling method = hash breaks long filenames.
      from  e4e143e... s3: Fix _samr_GetAliasMembership for results with 0 rids (cherry picked from commit 20bcdf85f16216c45ded886217fedc4516cc591c)

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


- Log -----------------------------------------------------------------
commit 2f1a66a72a6bd9f3e160b01982171dd66835990e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 17 16:21:46 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 96fe4d2..b582d19 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);
 	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


More information about the samba-cvs mailing list