From 1a97bd915dfe90b40ec03617af3d8d25483af9c9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 26 Aug 2009 17:31:44 +1000 Subject: 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 --- 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 diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index a8cedaf23a..0a3a44f0cd 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 e2e7d096af..4d71d96d8a 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 0000000000..7625cc7ed6 --- /dev/null +++ b/source4/setup/provision_options.ldif @@ -0,0 +1,3 @@ +dn: @OPTIONS +checkBaseOnSearch: TRUE + -- cgit