mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
r26245: Make it easier to handle the LDAP backend, with it's differing needs,
by seperating the modules list into parts. That way, we can remove
the modules that the backend will provide.
Andrew Bartlett
(This used to be commit d67e5c7896
)
This commit is contained in:
parent
cd1f19d7d3
commit
a2a4aba5fd
@ -977,23 +977,25 @@ function provision_guess()
|
||||
// module when expanding the objectclass list)
|
||||
// - partition must be last
|
||||
// - each partition has its own module list then
|
||||
modules_list = new Array("rootdse",
|
||||
"paged_results",
|
||||
"ranged_results",
|
||||
"server_sort",
|
||||
"extended_dn",
|
||||
"asq",
|
||||
"samldb",
|
||||
"rdn_name",
|
||||
"objectclass",
|
||||
"kludge_acl",
|
||||
"operational",
|
||||
"subtree_rename",
|
||||
"subtree_delete",
|
||||
"linked_attributes",
|
||||
"show_deleted",
|
||||
"partition");
|
||||
var modules_list = new Array("rootdse",
|
||||
"paged_results",
|
||||
"ranged_results",
|
||||
"server_sort",
|
||||
"extended_dn",
|
||||
"asq",
|
||||
"samldb",
|
||||
"rdn_name",
|
||||
"objectclass",
|
||||
"kludge_acl",
|
||||
"operational");
|
||||
var tdb_modules_list = new Array("subtree_rename",
|
||||
"subtree_delete",
|
||||
"linked_attributes");
|
||||
var modules_list2 = new Array("show_deleted",
|
||||
"partition");
|
||||
subobj.MODULES_LIST = join(",", modules_list);
|
||||
subobj.TDB_MODULES_LIST = "," + join(",", tdb_modules_list);
|
||||
subobj.MODULES_LIST2 = join(",", modules_list2);
|
||||
subobj.DOMAINDN_LDB = "users.ldb";
|
||||
subobj.CONFIGDN_LDB = "configuration.ldb";
|
||||
subobj.SCHEMADN_LDB = "schema.ldb";
|
||||
|
@ -142,6 +142,7 @@ if (ldapbackend) {
|
||||
}
|
||||
if (!ldapmodule) {
|
||||
subobj.LDAPMODULE = "entryuuid";
|
||||
subobj.TDB_MODULES_LIST = "";
|
||||
}
|
||||
subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
|
||||
subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";
|
||||
|
@ -10,4 +10,4 @@ modules:${CONFIGDN}:${CONFIGDN_MOD}${CONFIGDN_MOD2}
|
||||
modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2}
|
||||
|
||||
dn: @MODULES
|
||||
@LIST: ${MODULES_LIST}
|
||||
@LIST: ${MODULES_LIST}${TDB_MODULES_LIST},${MODULES_LIST2}
|
||||
|
Loading…
Reference in New Issue
Block a user