[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2206-g48dbfc8

[Andrew Tridgell]

The branch, master has been updated
       via  48dbfc89cf532704a0e2fedff828a0a48476053f (commit)
      from  b660e51decaa1da99bce7eac80e6a6fad69b6dcb (commit)

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


- Log -----------------------------------------------------------------
commit 48dbfc89cf532704a0e2fedff828a0a48476053f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jun 10 10:13:55 2009 +1000

    fixed server side sorting of case-insensitive strings
    
    The sort module uses ldb_comparison_fold() as the comparison function
    for case-insensitive attributes. In other places the function is being
    used to produce a boolean, but for sorting we care about ordering.
    
    The n1 - n2 return was sorting by length, not value

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

Summary of changes:
 source4/lib/ldb/common/attrib_handlers.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/common/attrib_handlers.c b/source4/lib/ldb/common/attrib_handlers.c
index 4869e32..9cb9ff8 100644
--- a/source4/lib/ldb/common/attrib_handlers.c
+++ b/source4/lib/ldb/common/attrib_handlers.c
@@ -216,9 +216,6 @@ int ldb_comparison_fold(struct ldb_context *ldb, void *mem_ctx,
 		while (*s1 == ' ') { s1++; n1--; }
 		while (*s2 == ' ') { s2++; n2--; }
 	}
-	if (n1 != n2) {
-		return n1 - n2;
-	}
 	return (int)(toupper(*s1)) - (int)(toupper(*s2));
 
 utf8str:


-- 
Samba Shared Repository