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_modify.ldif | 31 +++++++--------------------- 1 file changed, 8 insertions(+), 23 deletions(-) (limited to 'source4/setup/provision_dnszones_modify.ldif') 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} - -- cgit