[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  966667a ldb: bad if test in ldb_comparison_fold()
      from  f6ac6f2 docs: update the manpage of vfs_shadow_copy2

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


- Log -----------------------------------------------------------------
commit 966667abbef2da09b4a42725a86f3202b88e3966
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 6 15:58:02 2013 -0800

    ldb: bad if test in ldb_comparison_fold()
    
    Found by David Binderman <dcb314 at hotmail.com>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10305
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Sat Dec  7 11:10:47 CET 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/lib/ldb/common/attrib_handlers.c b/lib/ldb/common/attrib_handlers.c
index daeb422..4b94d39 100644
--- a/lib/ldb/common/attrib_handlers.c
+++ b/lib/ldb/common/attrib_handlers.c
@@ -254,7 +254,7 @@ int ldb_comparison_fold(struct ldb_context *ldb, void *mem_ctx,
 	if (n2 == 0 && n1 != 0) {
 		return (int)toupper(*s1);
 	}
-	if (n2 == 0 && n2 == 0) {
+	if (n1 == 0 && n2 == 0) {
 		return 0;
 	}
 	return (int)toupper(*s1) - (int)toupper(*s2);


-- 
Samba Shared Repository