[Pkg-samba-maint] [samba] 128/135: ldb: bad if test in ldb_comparison_fold()

Ivo De Decker ivodd at moszumanska.debian.org
Sat Jan 11 21:30:32 UTC 2014


This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch master
in repository samba.

commit 5438b4840dc60b9c026388f405c0795051ed4b67
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
---
 lib/ldb/common/attrib_handlers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git




More information about the Pkg-samba-maint mailing list