From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Sun, 7 Apr 2024 02:58:48 +0000 (+1200)
Subject: ldb:sort: generalise both-NULL check to equality check
X-Git-Tag: ldb-2.8.1~25
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=867dce05d217ccf45e9bc74fdd2b2dae7d710fb3;p=thirdparty%2Fsamba.git

ldb:sort: generalise both-NULL check to equality check

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 531f31df99341b2cb1afc42538022451ca771983)
---

diff --git a/lib/ldb/modules/sort.c b/lib/ldb/modules/sort.c
index a4a77329cee..72c60fc894a 100644
--- a/lib/ldb/modules/sort.c
+++ b/lib/ldb/modules/sort.c
@@ -125,7 +125,7 @@ static int sort_compare(struct ldb_message **msg1, struct ldb_message **msg2, vo
 	 * NULL and empty elements sort at the end (regardless of ac->reverse flag).
 	 * NULL elements come after empty ones.
 	 */
-	if (el1 == NULL && el2 == NULL) {
+	if (el1 == el2) {
 		return 0;
 	}
 	if (el1 == NULL) {