summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-09-20 17:33:20 +1000
committerAmitay Isaacs <amitay@samba.org>2011-11-09 08:27:46 +0100
commit0c2f91c6b299e6ba6243268aa7b131f5c04f92b1 (patch)
tree410c5f3e53e7a290f3ec4977bc158d85e3167a17 /source4
parenta807c8364168850f4c626aeecca56e1762b5d45b (diff)
downloadsamba-0c2f91c6b299e6ba6243268aa7b131f5c04f92b1.tar.gz
samba-0c2f91c6b299e6ba6243268aa7b131f5c04f92b1.tar.bz2
samba-0c2f91c6b299e6ba6243268aa7b131f5c04f92b1.zip
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 <amitay@samba.org> Autobuild-Date: Wed Nov 9 08:27:46 CET 2011 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision/sambadns.py2
-rw-r--r--source4/setup/provision_dnszones_add.ldif6
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 24272f5017..c3725f6da1 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,<PREFIX>,<DOMAINDN>
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,<PREFIX>,<DOMAINDN>
diff --git a/source4/setup/provision_dnszones_add.ldif b/source4/setup/provision_dnszones_add.ldif
index fc814b2b6d..bd97bb9aac 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