sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

ldb:attrib_handlers: make ldb_comparison_Boolean more consistent

Browse Source 
This isn't supposed to be used for sorting, but it is hard to say it
won't be, so we might as well make it sort properly.

Following long-standing behaviour, we try to sort "FALSE" > "TRUE", by
length, then switch to using strncasecmp().

strncasecmp would sort the other way, so we swap the operands. This is
to make e.g. "TRUE\0" sort the same as "TRUE".

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>
This commit is contained in:
Douglas Bagnall 2024-04-10 10:54:41 +12:00 committed by Andrew Bartlett
parent 7280c8e53f
commit a75c98ad68
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/ldb/common/attrib_handlers.c
View File

@ -281,15 +281,36 @@ static int ldb_canonicalise_Boolean(struct ldb_context *ldb, void *mem_ctx,
} }
/* /*
compare two Booleans * compare two Booleans.
*/ *
* According to RFC4517 4.2.2, "the booleanMatch rule is an equality matching
* rule", meaning it isn't used for ordering.
*
* However, it seems conceivable that Samba could be coerced into sorting on a
* field with Boolean syntax, so we might as well have consistent behaviour in
* that case.
*
* The most probably values are {"FALSE", 5} and {"TRUE", 4}. To save time we
* compare first by length, which makes FALSE > TRUE. This is somewhat
* contrary to convention, but is how Samba has worked forever.
*
* If somehow we are comparing incompletely normalised values where the length
* is the same (for example {"false", 5} and {"TRUE\0", 5}), the length is the
* same, and we fall back to a strncasecmp. In this case, since "FALSE" is
* alphabetically lower, we swap the order, so that "TRUE\0" again comes
* before "FALSE".
*
* ldb_canonicalise_Boolean (just above) gives us a clue as to what we might
* expect to cope with by way of invalid values.
*/
static int ldb_comparison_Boolean(struct ldb_context *ldb, void *mem_ctx, static int ldb_comparison_Boolean(struct ldb_context *ldb, void *mem_ctx,
const struct ldb_val *v1, const struct ldb_val *v2) const struct ldb_val *v1, const struct ldb_val *v2)
{ {
if (v1->length != v2->length) { if (v1->length != v2->length) {
return NUMERIC_CMP(v1->length, v2->length); return NUMERIC_CMP(v2->length, v1->length);
} }
return strncasecmp((char *)v1->data, (char *)v2->data, v1->length); /* reversed, see long comment above */
return strncasecmp((char *)v2->data, (char *)v1->data, v1->length);
} }