From: Howard Chu <hyc@openldap.org>
Date: Mon, 18 May 2015 17:06:58 +0000 (+0100)
Subject: ITS#8146 tweak prev commit
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f05e3d9660bbc12612f47435e51137d5fe38011;p=openldap

ITS#8146 tweak prev commit

Test less likely condition first
---

diff --git a/servers/slapd/back-mdb/filterindex.c b/servers/slapd/back-mdb/filterindex.c
index a0fd41b07b..162dba9ae2 100644
--- a/servers/slapd/back-mdb/filterindex.c
+++ b/servers/slapd/back-mdb/filterindex.c
@@ -211,7 +211,7 @@ mdb_filter_candidates(
 		/* Must not return NULL, otherwise extended filters break */
 		MDB_IDL_ALL( ids );
 	}
-	if ( MDB_IDL_IS_RANGE( ids ) && ids[2] == NOID ) {
+	if ( ids[2] == NOID && MDB_IDL_IS_RANGE( ids )) {
 		struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
 		ID last;