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

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8cedaf23a6be4020aa2762a101edaecd07de0e0..0a3a44f0cdd0afabec6c01f8666dd3bb83959a79 100644 (file)
--- 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)
 
     # 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
 
     if fill == FILL_DRS:
         return samdb
 

diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index e2e7d096af0d819eb0612c1c21a39443fa27f494..4d71d96d8abe6fac91ec87580320dba5ad8714f8 100644 (file)
--- 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
 dn: @KLUDGEACL
 passwordAttribute: clearTextPassword
 passwordAttribute: userPassword

diff --git a/source4/setup/provision_options.ldif b/source4/setup/provision_options.ldif
new file mode 100644 (file)
index 0000000..7625cc7
--- /dev/null
+++ b/source4/setup/provision_options.ldif
@@ -0,0 +1,3 @@
+dn: @OPTIONS
+checkBaseOnSearch: TRUE
+