From af3138e9b6813ef88698c3e6eeb280c6e988c4cc Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 Sep 2013 11:54:23 +1200 Subject: samba-tool domain join subdomain: Rework sambadns.py to allow setup of DomainDNSZone only This skips handling the ForestDNSZone when we are setting up a subdomain. Andrew Bartlett Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Fri Oct 11 10:27:49 CEST 2013 on sn-devel-104 --- source4/setup/provision_dnszones_add.ldif | 51 +++++-------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) (limited to 'source4/setup/provision_dnszones_add.ldif') 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} - -- cgit