Author: abartlet Date: 2007-12-03 05:51:04 +0000 (Mon, 03 Dec 2007) New Revision: 26245
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26245 Log: 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 Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js branches/SAMBA_4_0/source/setup/provision branches/SAMBA_4_0/source/setup/provision_partitions.ldif Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-12-03 05:49:06 UTC (rev 26244) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-12-03 05:51:04 UTC (rev 26245) @@ -977,23 +977,25 @@ // 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"; Modified: branches/SAMBA_4_0/source/setup/provision =================================================================== --- branches/SAMBA_4_0/source/setup/provision 2007-12-03 05:49:06 UTC (rev 26244) +++ branches/SAMBA_4_0/source/setup/provision 2007-12-03 05:51:04 UTC (rev 26245) @@ -142,6 +142,7 @@ } if (!ldapmodule) { subobj.LDAPMODULE = "entryuuid"; + subobj.TDB_MODULES_LIST = ""; } subobj.DOMAINDN_LDB = subobj.LDAPBACKEND; subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches"; Modified: branches/SAMBA_4_0/source/setup/provision_partitions.ldif =================================================================== --- branches/SAMBA_4_0/source/setup/provision_partitions.ldif 2007-12-03 05:49:06 UTC (rev 26244) +++ branches/SAMBA_4_0/source/setup/provision_partitions.ldif 2007-12-03 05:51:04 UTC (rev 26245) @@ -10,4 +10,4 @@ modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2} dn: @MODULES [EMAIL PROTECTED]: ${MODULES_LIST} [EMAIL PROTECTED]: ${MODULES_LIST}${TDB_MODULES_LIST},${MODULES_LIST2}
