From 0c2f91c6b299e6ba6243268aa7b131f5c04f92b1 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 20 Sep 2011 17:33:20 +1000 Subject: [PATCH] s4-provision: Create ldap records for DNS partitions similar to windows this allows easy comparison between windows and samba ldap trees Autobuild-User: Amitay Isaacs Autobuild-Date: Wed Nov 9 08:27:46 CET 2011 on sn-devel-104 --- source4/scripting/python/samba/provision/sambadns.py | 2 +- source4/setup/provision_dnszones_add.ldif | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py index 24272f50172..c3725f6da17 100644 --- a/source4/scripting/python/samba/provision/sambadns.py +++ b/source4/scripting/python/samba/provision/sambadns.py @@ -278,7 +278,6 @@ def add_dns_container(samdb, domaindn, prefix, domainsid): sec = security.descriptor.from_sddl(sddl, domainsid) msg = ldb.Message(ldb.Dn(samdb, "CN=MicrosoftDNS,%s,%s" % (prefix, domaindn))) msg["objectClass"] = ["top", "container"] - msg["displayName"] = ldb.MessageElement("DNS Servers", ldb.FLAG_MOD_ADD, "displayName") msg["nTSecurityDescriptor"] = ndr_pack(sec) samdb.add(msg) @@ -311,6 +310,7 @@ def add_rootservers(samdb, domaindn, prefix): # Add DC=RootDNSServers,CN=MicrosoftDNS,, msg = ldb.Message(ldb.Dn(samdb, container_dn)) msg["objectClass"] = ["top", "dnsZone"] + msg["cn"] = ldb.MessageElement("Zone", ldb.FLAG_MOD_ADD, "cn") samdb.add(msg) # Add DC=@,DC=RootDNSServers,CN=MicrosoftDNS,, diff --git a/source4/setup/provision_dnszones_add.ldif b/source4/setup/provision_dnszones_add.ldif index fc814b2b6d8..bd97bb9aacd 100644 --- a/source4/setup/provision_dnszones_add.ldif +++ b/source4/setup/provision_dnszones_add.ldif @@ -24,9 +24,8 @@ systemFlags: -1946157056 dn: CN=NTDS Quotas,${DOMAINZONE_DN} objectClass: top objectClass: msDS-QuotaContainer -description: Quota specifications container isCriticalSystemObject: TRUE -msDS-TombstoneQuotaFactor: 100 +systemFlags: -1946157056 dn: CN=Deleted Objects,${FORESTZONE_DN} @@ -52,9 +51,8 @@ systemFlags: -1946157056 dn: CN=NTDS Quotas,${FORESTZONE_DN} objectClass: top objectClass: msDS-QuotaContainer -description: Quota specifications container isCriticalSystemObject: TRUE -msDS-TombstoneQuotaFactor: 100 +systemFlags: -1946157056 ################################# # Configure partitions -- 2.34.1