From c08f174c35fb0159d219f96eaf37f008d76fb41e Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Tue, 30 Mar 2021 16:02:27 +1300 Subject: [PATCH] cracknames: Allow auto-conversion from an extended canonical name Signed-off-by: Joseph Sutton Reviewed-by: Douglas Bagnall --- selftest/knownfail.d/bug-10319 | 1 - source4/dsdb/samdb/cracknames.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 selftest/knownfail.d/bug-10319 diff --git a/selftest/knownfail.d/bug-10319 b/selftest/knownfail.d/bug-10319 deleted file mode 100644 index 0218e6bda53..00000000000 --- a/selftest/knownfail.d/bug-10319 +++ /dev/null @@ -1 +0,0 @@ -^samba4.ldap.bind\(fl2008r2dc\).__main__.BindTests.test_user_account_bind\(fl2008r2dc\) diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c index df5126b7a7d..f298ef3df6f 100644 --- a/source4/dsdb/samdb/cracknames.c +++ b/source4/dsdb/samdb/cracknames.c @@ -1519,6 +1519,8 @@ NTSTATUS crack_auto_name_to_nt4_name(TALLOC_CTX *mem_ctx, format_offered = DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL; } else if (strchr_m(name, '\\')) { format_offered = DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT; + } else if (strchr_m(name, '\n')) { + format_offered = DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX; } else if (strchr_m(name, '/')) { format_offered = DRSUAPI_DS_NAME_FORMAT_CANONICAL; } else if ((name[0] == 'S' || name[0] == 's') && name[1] == '-') { -- 2.47.3