From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 11 Apr 2024 06:08:54 +0000 (+1200)
Subject: ldb-samba:ldif_handlers: dn_link_comparison: sort invalid DNs
X-Git-Tag: tdb-1.4.11~1020
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7280c8e53f463108fe3de443ce63572dde689a30;p=thirdparty%2Fsamba.git

ldb-samba:ldif_handlers: dn_link_comparison: sort invalid DNs

If both DNs are invalid, we can say they are equal.

This means invalid or NULL DNs will sort to the end of the array,
before deleted DNs:

[ valid DNs, sorted | invalid/NULL DNs | deleted DNs, sorted ]

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

diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c
index 04b6bcc3e81..f77f86fdcc0 100644
--- a/lib/ldb-samba/ldif_handlers.c
+++ b/lib/ldb-samba/ldif_handlers.c
@@ -1181,12 +1181,18 @@ static int samba_ldb_dn_link_comparison(struct ldb_context *ldb, void *mem_ctx,
 	}
 
 	dn1 = ldb_dn_from_ldb_val(mem_ctx, ldb, v1);
+	dn2 = ldb_dn_from_ldb_val(mem_ctx, ldb, v2);
+
 	if ( ! ldb_dn_validate(dn1)) {
 		TALLOC_FREE(dn1);
+		if ( ! ldb_dn_validate(dn2)) {
+			TALLOC_FREE(dn2);
+			return 0;
+		}
+		TALLOC_FREE(dn2);
 		return 1;
 	}
 
-	dn2 = ldb_dn_from_ldb_val(mem_ctx, ldb, v2);
 	if ( ! ldb_dn_validate(dn2)) {
 		TALLOC_FREE(dn1);
 		TALLOC_FREE(dn2);