5 files changed, 6 insertions, 7 deletions
diff --git a/source4/setup/aggregate_schema.ldif b/source4/setup/aggregate_schema.ldif
new file mode 100644
index 0000000000..2726704719
--- /dev/null
+++ b/source4/setup/aggregate_schema.ldif
@@ -0,0 +1,3 @@
+dn: CN=Aggregate,${SCHEMADN}
+objectClass: top
+objectClass: subSchema
diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif
index a7b501e8a8..7b13a193cb 100644
--- a/source4/setup/provision_basedn_modify.ldif
+++ b/source4/setup/provision_basedn_modify.ldif
@@ -61,9 +61,6 @@ uASCompat: 1
 replace: modifiedCount
 modifiedCount: 1
 -
-replace: objectCategory
-objectCategory: CN=Domain-DNS,${SCHEMADN}
--
 replace: fSMORoleOwner
 fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
 -
diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif
index 40ef709ac3..56eb7ce0c0 100644
--- a/source4/setup/schema.ldif
+++ b/source4/setup/schema.ldif
@@ -10373,6 +10373,3 @@ systemFlags: 16
 defaultHidingValue: TRUE
 defaultObjectCategory: CN=Group-Policy-Container,${SCHEMADN}
 
-dn: CN=Aggregate,${SCHEMADN}
-objectClass: top
-objectClass: subSchema
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index c27157d713..d42795b94d 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -244,7 +244,7 @@ systemAuxiliaryClass: samDomain
 defaultSecurityDescriptor: D:(A;;RPLCLORC;;;DA)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)(A;;RPLCLORC;;;AU)
 systemFlags: 16
 defaultHidingValue: TRUE
-defaultObjectCategory: CN=Builtin-Domain,${SCHEMADN}
+defaultObjectCategory: CN=Samba4-Local-Domain,${SCHEMADN}
 
 
 dn: CN=Samba4Top,${SCHEMADN}
diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf
index b64d581e0d..506dc504b4 100644
--- a/source4/setup/slapd.conf
+++ b/source4/setup/slapd.conf
@@ -51,6 +51,8 @@ defaultsearchbase ${DOMAINDN}
 
 rootdn cn=Manager
 
+overlay deref
+
 ${REFINT_CONFIG}
 
 ${MEMBEROF_CONFIG}