From: Douglas Bagnall Date: Wed, 17 Apr 2024 13:44:03 +0000 (+1200) Subject: ldb-samba: simplify extended_dn_read_SID() X-Git-Tag: tdb-1.4.11~816 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c702735641aaad58c317843c547249c6bd1c716;p=thirdparty%2Fsamba.git ldb-samba: simplify extended_dn_read_SID() This will allow the reading of SIDs that start with "s-", which Windows allows, and we allow elsewhere. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10763 Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/lib/ldb-samba/ldif_handlers.c b/lib/ldb-samba/ldif_handlers.c index cfec5e1c86b..5b9737542e9 100644 --- a/lib/ldb-samba/ldif_handlers.c +++ b/lib/ldb-samba/ldif_handlers.c @@ -204,10 +204,9 @@ static int extended_dn_read_SID(struct ldb_context *ldb, void *mem_ctx, { struct dom_sid sid; enum ndr_err_code ndr_err; - if (ldif_comparision_objectSid_isString(in)) { - if (ldif_read_objectSid(ldb, mem_ctx, in, out) == 0) { - return 0; - } + + if (ldif_read_objectSid(ldb, mem_ctx, in, out) == 0) { + return 0; } /* Perhaps not a string after all */ diff --git a/selftest/knownfail.d/sid-strings b/selftest/knownfail.d/sid-strings index 36b73ca98b7..5218b93d284 100644 --- a/selftest/knownfail.d/sid-strings +++ b/selftest/knownfail.d/sid-strings @@ -52,16 +52,12 @@ ^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_S-0-5-32-545.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_S-1-3-0.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_S-1-5-3.2-579.ad_dc -^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_s-1-5-32-545.ad_dc -^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_s-1-5-32-5791.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_S-10-5-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnInSearchBase.test_sid_string_S-2-5-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-0-5-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-1-0x05-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-1-3-0.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-1-5-3.2-579.ad_dc -^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_s-1-5-1234-5678.ad_dc -^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_s-1-5-32-545.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-10-5-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsAsDnSearchWithDnObject.test_sid_string_S-2-5-32-579.ad_dc ^samba.tests.sid_strings.+.SidStringsThatStartWithS.test_sid_string_.S-1-1-1-1-1-1-1.ad_dc