3 files changed, 16 insertions, 75 deletions
diff --git a/source4/setup/provision_dnszones_add.ldif b/source4/setup/provision_dnszones_add.ldif
index bf872f0b64..860aa4b72b 100644
--- a/source4/setup/provision_dnszones_add.ldif
+++ b/source4/setup/provision_dnszones_add.ldif
@@ -1,7 +1,7 @@
 #################################
 # Required objectclasses
 #################################
-dn: CN=Deleted Objects,${DOMAINZONE_DN}
+dn: CN=Deleted Objects,${ZONE_DN}
 objectClass: top
 objectClass: container
 description: Deleted objects
@@ -9,71 +9,34 @@ isDeleted: TRUE
 isCriticalSystemObject: TRUE
 systemFlags: -1946157056
 
-dn: CN=LostAndFound,${DOMAINZONE_DN}
+dn: CN=LostAndFound,${ZONE_DN}
 objectClass: top
 objectClass: lostAndFound
 isCriticalSystemObject: TRUE
 systemFlags: -1946157056
 nTSecurityDescriptor:: ${LOSTANDFOUND_DESCRIPTOR}
 
-dn: CN=Infrastructure,${DOMAINZONE_DN}
+dn: CN=Infrastructure,${ZONE_DN}
 objectClass: top
 objectClass: infrastructureUpdate
 isCriticalSystemObject: TRUE
 systemFlags: -1946157056
 nTSecurityDescriptor:: ${INFRASTRUCTURE_DESCRIPTOR}
 
-dn: CN=NTDS Quotas,${DOMAINZONE_DN}
+dn: CN=NTDS Quotas,${ZONE_DN}
 objectClass: top
 objectClass: msDS-QuotaContainer
 isCriticalSystemObject: TRUE
 systemFlags: -1946157056
 
 
-dn: CN=Deleted Objects,${FORESTZONE_DN}
-objectClass: top
-objectClass: container
-description: Deleted objects
-isDeleted: TRUE
-isCriticalSystemObject: TRUE
-systemFlags: -1946157056
-
-dn: CN=LostAndFound,${FORESTZONE_DN}
-objectClass: top
-objectClass: lostAndFound
-isCriticalSystemObject: TRUE
-systemFlags: -1946157056
-nTSecurityDescriptor:: ${LOSTANDFOUND_DESCRIPTOR}
-
-dn: CN=Infrastructure,${FORESTZONE_DN}
-objectClass: top
-objectClass: infrastructureUpdate
-isCriticalSystemObject: TRUE
-systemFlags: -1946157056
-nTSecurityDescriptor:: ${INFRASTRUCTURE_DESCRIPTOR}
-
-dn: CN=NTDS Quotas,${FORESTZONE_DN}
-objectClass: top
-objectClass: msDS-QuotaContainer
-isCriticalSystemObject: TRUE
-systemFlags: -1946157056
-
 #################################
 # Configure partitions
 #################################
-dn: CN=${DOMAINZONE_GUID},CN=Partitions,${CONFIGDN}
+dn: CN=${ZONE_GUID},CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRef
-nCName: ${DOMAINZONE_DN}
-dnsRoot: ${DOMAINZONE_DNS}
+nCName: ${ZONE_DN}
+dnsRoot: ${ZONE_DNS}
 systemFlags: 5
 msDS-NC-Replica-Locations: CN=NTDS Settings,${SERVERDN}
-
-dn: CN=${FORESTZONE_GUID},CN=Partitions,${CONFIGDN}
-objectClass: top
-objectClass: crossRef
-nCName: ${FORESTZONE_DN}
-dnsRoot: ${FORESTZONE_DNS}
-systemFlags: 5
-msDS-NC-Replica-Locations: CN=NTDS Settings,${SERVERDN}
-
diff --git a/source4/setup/provision_dnszones_modify.ldif b/source4/setup/provision_dnszones_modify.ldif
index 0dc942ff1e..108d8b8b1b 100644
--- a/source4/setup/provision_dnszones_modify.ldif
+++ b/source4/setup/provision_dnszones_modify.ldif
@@ -1,36 +1,21 @@
-dn: ${DOMAINZONE_DN}
+dn: ${ZONE_DN}
 changetype: modify
 add: wellKnownObjects
-wellKnownObjects: B:32:6227f0af1fc2410d8e3bb10615bb5b0f:CN=NTDS Quotas,${DOMAINZONE_DN}
-wellKnownObjects: B:32:18e2ea80684f11d2b9aa00c04f79f805:CN=Deleted Objects,${DOMAINZONE_DN}
-wellKnownObjects: B:32:2fbac1870ade11d297c400c04fd8d5cd:CN=Infrastructure,${DOMAINZONE_DN}
-wellKnownObjects: B:32:ab8153b7768811d1aded00c04fd8d5cd:CN=LostAndFound,${DOMAINZONE_DN}
+wellKnownObjects: B:32:6227f0af1fc2410d8e3bb10615bb5b0f:CN=NTDS Quotas,${ZONE_DN}
+wellKnownObjects: B:32:18e2ea80684f11d2b9aa00c04f79f805:CN=Deleted Objects,${ZONE_DN}
+wellKnownObjects: B:32:2fbac1870ade11d297c400c04fd8d5cd:CN=Infrastructure,${ZONE_DN}
+wellKnownObjects: B:32:ab8153b7768811d1aded00c04fd8d5cd:CN=LostAndFound,${ZONE_DN}
 
-dn: CN=Infrastructure,${DOMAINZONE_DN}
+dn: CN=Infrastructure,${ZONE_DN}
 changetype: modify
 add: fSMORoleOwner
 fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
 
-dn: CN=Infrastructure,${FORESTZONE_DN}
-changetype: modify
-add: fSMORoleOwner
-fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
-
-dn: ${FORESTZONE_DN}
-changetype: modify
-add: wellKnownObjects
-wellKnownObjects: B:32:6227f0af1fc2410d8e3bb10615bb5b0f:CN=NTDS Quotas,${FORESTZONE_DN}
-wellKnownObjects: B:32:18e2ea80684f11d2b9aa00c04f79f805:CN=Deleted Objects,${FORESTZONE_DN}
-wellKnownObjects: B:32:2fbac1870ade11d297c400c04fd8d5cd:CN=Infrastructure,${FORESTZONE_DN}
-wellKnownObjects: B:32:ab8153b7768811d1aded00c04fd8d5cd:CN=LostAndFound,${FORESTZONE_DN}
-
 dn: CN=NTDS Settings,${SERVERDN}
 changetype: modify
 add: msDS-HasInstantiatedNCs
-msDS-HasInstantiatedNCs: B:8:0000000D:${DOMAINZONE_DN}
-msDS-HasInstantiatedNCs: B:8:0000000D:${FORESTZONE_DN}
+msDS-HasInstantiatedNCs: B:8:0000000D:${ZONE_DN}
 -
 add: msDS-hasMasterNCs
-msDS-hasMasterNCs: ${DOMAINZONE_DN}
-msDS-hasMasterNCs: ${FORESTZONE_DN}
+msDS-hasMasterNCs: ${ZONE_DN}
 -
diff --git a/source4/setup/provision_dnszones_partitions.ldif b/source4/setup/provision_dnszones_partitions.ldif
index 4ab7aedd90..c022bd02aa 100644
--- a/source4/setup/provision_dnszones_partitions.ldif
+++ b/source4/setup/provision_dnszones_partitions.ldif
@@ -1,7 +1,7 @@
 ################################
 ## DNSZones Naming Context
 ################################
-dn: ${DOMAINZONE_DN}
+dn: ${ZONE_DN}
 objectClass: top
 objectClass: domainDNS
 description: Microsoft DNS Directory
@@ -9,10 +9,3 @@ msDS-NcType: 0
 instanceType: 13
 ntSecurityDescriptor:: ${SECDESC}
 
-dn: ${FORESTZONE_DN}
-objectClass: top
-objectClass: domainDNS
-description: Microsoft DNS Directory
-msDS-NcType: 0
-instanceType: 13
-ntSecurityDescriptor:: ${SECDESC}