From da2e34a134545113c19056e4b20b457676ac0215 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sat, 30 Apr 2011 01:20:32 +0400 Subject: provision: reorganize attributes so that we don't attribute with DN syntax that depends on non present object Autobuild-User: Matthieu Patou Autobuild-Date: Sat Apr 30 14:51:16 CEST 2011 on sn-devel-104 --- source4/scripting/python/samba/provision/__init__.py | 5 +++++ source4/setup/provision_basedn_modify.ldif | 6 ------ source4/setup/provision_self_join_modify.ldif | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index ff9b00122d..bdca992412 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1166,6 +1166,11 @@ def setup_samdb(path, session_info, provision_backend, lp, names, "DESCRIPTOR": descr, }) + # Now register this container in the root of the forest + msg = ldb.Message(ldb.Dn(samdb, names.domaindn)) + msg["subRefs"] = ldb.MessageElement(names.configdn , ldb.FLAG_MOD_ADD, + "subRefs") + # The LDIF here was created when the Schema object was constructed logger.info("Setting up sam.ldb schema") samdb.add_ldif(schema.schema_dn_add, controls=["relax:0"]) diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index d67d674319..a5e704769d 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/setup/provision_basedn_modify.ldif @@ -82,15 +82,9 @@ pwdProperties: 1 replace: pwdHistoryLength pwdHistoryLength: 24 - -replace: rIDManagerReference -rIDManagerReference: CN=RID Manager$,CN=System,${DOMAINDN} -- replace: serverState serverState: 1 - -replace: subRefs -subRefs: ${CONFIGDN} -- replace: systemFlags systemFlags: -1946157056 - diff --git a/source4/setup/provision_self_join_modify.ldif b/source4/setup/provision_self_join_modify.ldif index 2fe5a43db6..aba1b862e1 100644 --- a/source4/setup/provision_self_join_modify.ldif +++ b/source4/setup/provision_self_join_modify.ldif @@ -2,6 +2,8 @@ dn: ${DOMAINDN} changetype: modify replace: fSMORoleOwner fSMORoleOwner: CN=NTDS Settings,${SERVERDN} +replace: rIDManagerReference +rIDManagerReference: CN=RID Manager$,CN=System,${DOMAINDN} dn: ${SCHEMADN} changetype: modify -- cgit