diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-12-16 09:18:21 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-12-17 12:29:28 +1100 |
| commit | ebe1e923c862798602b563211ec8c625fc4032ea (patch) | |
| tree | 275853c1da2027363cc9864fdeb03f74468c44a9 | |
| parent | 1f28541a241d2dc4c5460344f817d56182a672ce (diff) | |
| download | samba-ebe1e923c862798602b563211ec8c625fc4032ea.tar.gz samba-ebe1e923c862798602b563211ec8c625fc4032ea.tar.bz2 samba-ebe1e923c862798602b563211ec8c625fc4032ea.zip | |
s4:provision: use extended_dn_out_ldb or extended_dn_out_dereference depending on the backend
This just changes the existing stratagy of loading different modules
for the OpenLDAP backend to also include extended_dn_out_*
When we provision the OpenLDAP backend, we make sure to include the
'deref' overlay (which must be made available by the OpenLDAP build)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 9 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 9ee77bd376..5da073c563 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -471,7 +471,8 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, tdb_modules_list = [ "subtree_rename", "subtree_delete", - "linked_attributes"] + "linked_attributes", + "extended_dn_out_ldb"] modules_list2 = ["show_deleted", "partition"] @@ -489,11 +490,11 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, if ldap_backend_type == "fedora-ds": backend_modules = ["nsuniqueid", "paged_searches"] # We can handle linked attributes here, as we don't have directory-side subtree operations - tdb_modules_list = ["linked_attributes"] + tdb_modules_list = ["linked_attributes", "extended_dn_out_dereference"] elif ldap_backend_type == "openldap": - backend_modules = ["normalise", "entryuuid", "paged_searches"] + backend_modules = ["entryuuid", "paged_searches"] # OpenLDAP handles subtree renames, so we don't want to do any of these things - tdb_modules_list = None + tdb_modules_list = ["extended_dn_out_dereference"] elif ldap_backend is not None: raise "LDAP Backend specified, but LDAP Backend Type not specified" elif serverrole == "domain controller": diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index b64d581e0d..506dc504b4 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -51,6 +51,8 @@ defaultsearchbase ${DOMAINDN} rootdn cn=Manager +overlay deref + ${REFINT_CONFIG} ${MEMBEROF_CONFIG} |