diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-26 17:31:44 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-26 17:37:01 +1000 |
| commit | 1a97bd915dfe90b40ec03617af3d8d25483af9c9 (patch) | |
| tree | dcd3a58978ca717424467a65987d1c5822db71b6 | |
| parent | 425386ff6141bba2e7b1d8f3c27e96aaf1c5cb95 (diff) | |
| download | samba-1a97bd915dfe90b40ec03617af3d8d25483af9c9.tar.gz samba-1a97bd915dfe90b40ec03617af3d8d25483af9c9.tar.bz2 samba-1a97bd915dfe90b40ec03617af3d8d25483af9c9.zip | |
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
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 4 | ||||
| -rw-r--r-- | source4/setup/provision_init.ldif | 3 | ||||
| -rw-r--r-- | source4/setup/provision_options.ldif | 3 |
3 files changed, 7 insertions, 3 deletions
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 + |