summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/dsdb/samdb/ldb_modules/descriptor.c4
-rw-r--r--source4/dsdb/samdb/ldb_modules/samba_dsdb.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 47207db201..f2afe742af 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -543,7 +543,7 @@ static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
}
objectclass = get_last_structural_class(schema, objectclass_element,
- false);
+ true);
if (objectclass == NULL) {
return ldb_operr(ldb);
}
@@ -662,7 +662,7 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
}
objectclass = get_last_structural_class(schema, objectclass_element,
- false);
+ true);
if (objectclass == NULL) {
return ldb_operr(ldb);
}
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index c7c4fe377c..d58b584b77 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -150,6 +150,8 @@ static int samba_dsdb_init(struct ldb_module *module)
- extended_dn_in must be before objectclass.c, as it resolves the DN
- objectclass must be before password_hash and samldb since these LDB
modules require the expanded "objectClass" list
+ - objectclass must be before descriptor, as descriptor assumes that
+ objectClass values are sorted
- objectclass_attrs must be behind operational in order to see all
attributes (the operational module protects and therefore
suppresses per default some important ones)