s4:operational LDB module - "canonicalName" doesn't make use of the "distinguishedNam...

It uses the DN from the returned message

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 3151061409060a7982aae0cb62df2a3834192176..12edfc2dbcf38ed3cc574178ad424527b37d4d64 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -539,8 +539,8 @@ static const struct {
 } search_sub[] = {
        { "createTimestamp", "whenCreated", NULL , NULL },
        { "modifyTimestamp", "whenChanged", NULL , NULL },
-       { "structuralObjectClass", "objectClass", NULL , NULL },
-       { "canonicalName", "distinguishedName", NULL , construct_canonical_name },
+       { "structuralObjectClass", NULL, NULL , NULL },
+       { "canonicalName", NULL, NULL , construct_canonical_name },
        { "primaryGroupToken", "objectClass", "objectSid", construct_primary_group_token },
        { "tokenGroups", "objectClass", NULL, construct_token_groups },
        { "parentGUID", NULL, NULL, construct_parent_guid },