[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  da2e34a provision: reorganize attributes so that we don't attribute with DN syntax that depends on non present object
      from  5e82d1d script/autobuild.py: don't force usage of ccache and gcc

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit da2e34a134545113c19056e4b20b457676ac0215
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Apr 30 01:20:32 2011 +0400

    provision: reorganize attributes so that we don't attribute with DN syntax that depends on non present object
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sat Apr 30 14:51:16 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 .../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(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index ff9b001..bdca992 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 d67d674..a5e7047 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 2fe5a43..aba1b86 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


-- 
Samba Shared Repository