s4:provision Set @OPTIONS in the provision_init.ldif

The new partitions code knows to copy these items in when creating a
new parition, so we can set it from the start.

Andrew Bartlett

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index dff61415a7417d322f401b51e27145ec95b8c86d..1a7a3865d83df62b7a8a59e2e7163664be8c57f1 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1004,9 +1004,6 @@ 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 4d71d96d8abe6fac91ec87580320dba5ad8714f8..3fcb97aa113b1682eb5396718581a7868877b086 100644 (file)
--- a/source4/setup/provision_init.ldif
+++ b/source4/setup/provision_init.ldif
@@ -17,3 +17,6 @@ passwordAttribute: trustAuthOutgoing
 passwordAttribute: trustAuthIncoming
 passwordAttribute: initialAuthOutgoing
 passwordAttribute: initialAuthIncoming
+
+dn: @OPTIONS
+checkBaseOnSearch: TRUE

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