[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1187-g1a97bd9

[Andrew Bartlett]

The branch, master has been updated
       via  1a97bd915dfe90b40ec03617af3d8d25483af9c9 (commit)
      from  425386ff6141bba2e7b1d8f3c27e96aaf1c5cb95 (commit)

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


- Log -----------------------------------------------------------------
commit 1a97bd915dfe90b40ec03617af3d8d25483af9c9
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Aug 26 17:31:44 2009 +1000

    s4:provision Ensure that @OPTIONS is mirrored into each partition
    
    The previous patches to the provision system cut down on the number of
    reconnects, and disabled the partition handling for part of the
    process.  This means we lost the setting of @OPTIONS as a replicated
    attribute into the partitions.
    
    Andrew Bartlett

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

Summary of changes:
 source4/scripting/python/samba/provision.py |    4 ++++
 source4/setup/provision_init.ldif           |    3 ---
 source4/setup/provision_options.ldif        |    3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 source4/setup/provision_options.ldif


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8cedaf..0a3a44f 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -842,6 +842,10 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
 
     # And now we can connect to the DB - the schema won't be loaded from the DB
     samdb.connect(path)
+
+    # Load @OPTIONS
+    samdb.load_ldif_file_add(setup_path("provision_options.ldif"))
+
     if fill == FILL_DRS:
         return samdb
 
diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index e2e7d09..4d71d96 100644
--- a/source4/setup/provision_init.ldif
+++ b/source4/setup/provision_init.ldif
@@ -1,6 +1,3 @@
-dn: @OPTIONS
-checkBaseOnSearch: TRUE
-
 dn: @KLUDGEACL
 passwordAttribute: clearTextPassword
 passwordAttribute: userPassword
diff --git a/source4/setup/provision_options.ldif b/source4/setup/provision_options.ldif
new file mode 100644
index 0000000..7625cc7
--- /dev/null
+++ b/source4/setup/provision_options.ldif
@@ -0,0 +1,3 @@
+dn: @OPTIONS
+checkBaseOnSearch: TRUE
+


-- 
Samba Shared Repository