sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ldb-samba:ldif_handlers: dn_link_comparison semi-sorts deleted objects

Browse Source 
We were always returning -1 for a deleted object, which works for an
equality test, but not a relative comparison.

This sorts deleted DNs toward the end of the list -- except when both
DNs are deleted. What should happen there is yet to be determined.

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 db963b1674)
This commit is contained in:
Douglas Bagnall 2024-04-11 16:25:02 +12:00 committed by Jule Anger
parent da5c625e64
commit 956bff1dc6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ldb-samba/ldif_handlers.c
View File

@ -1159,13 +1159,15 @@ static int samba_ldb_dn_link_comparison(struct ldb_context *ldb, void *mem_ctx,
struct ldb_dn *dn1 = NULL, *dn2 = NULL; struct ldb_dn *dn1 = NULL, *dn2 = NULL;
int ret; int ret;
/*
* In a sort context, Deleted DNs get shifted to the end.
* They never match in an equality
*/
if (dsdb_dn_is_deleted_val(v1)) { if (dsdb_dn_is_deleted_val(v1)) {
/* If the DN is deleted, then we can't search for it */ return 1;
return -1;
} }
if (dsdb_dn_is_deleted_val(v2)) { if (dsdb_dn_is_deleted_val(v2)) {
/* If the DN is deleted, then we can't search for it */
return -1; return -1;
} }