summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-10 09:26:06 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-10-21 22:43:50 +1100
commitd4048b2e1771724d4e155172ff96983149f669e6 (patch)
tree563ccb1e45885ccdc27e05f357e67b58888b4116 /source4
parentc59f00805cb06f3cb90d89690e142006658972d3 (diff)
downloadsamba-d4048b2e1771724d4e155172ff96983149f669e6.tar.gz
samba-d4048b2e1771724d4e155172ff96983149f669e6.tar.bz2
samba-d4048b2e1771724d4e155172ff96983149f669e6.zip
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
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py3
-rw-r--r--source4/setup/provision_init.ldif3
-rw-r--r--source4/setup/provision_options.ldif3
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index dff61415a7..1a7a3865d8 100644
--- 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 4d71d96d8a..3fcb97aa11 100644
--- 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
index 7625cc7ed6..0000000000
--- a/source4/setup/provision_options.ldif
+++ /dev/null
@@ -1,3 +0,0 @@
-dn: @OPTIONS
-checkBaseOnSearch: TRUE
-