diff options
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 3 | ||||
| -rw-r--r-- | source4/setup/provision_init.ldif | 3 | ||||
| -rw-r--r-- | source4/setup/provision_options.ldif | 3 |
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 - |