cracknames: Allow auto-conversion from an extended canonical name

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/selftest/knownfail.d/bug-10319 b/selftest/knownfail.d/bug-10319
deleted file mode 100644 (file)
index 0218e6b..0000000
--- 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 df5126b7a7d91e1d6f4a3b72496cfb414210f12a..f298ef3df6f45bba6ac19a8b9a28ddc4814f41b5 100644 (file)
--- 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] == '-') {