From e9d19477e43b65f91bd152f5249b684dbefa5cc6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 21 Jun 2007 10:18:20 +0000 Subject: r23560: - Activate metze's schema modules (from metze's schema-loading-13 patch). - samba3sam.js: rework the samba3sam test to not use objectCategory, as it's has special rules (dnsName a simple match) - ldap.js: Test the ordering of the objectClass attributes for the baseDN - schema_init.c: Load the mayContain and mustContain (and system...) attributes when reading the schema from ldb - To make the schema load not suck in terms of performance, write the schema into a static global variable - ldif_handlers.c: Match objectCategory for equality and canonicolisation based on the loaded schema, not simple tring manipuation - ldb_msg.c: don't duplicate attributes when adding attributes to a list - kludge_acl.c: return allowedAttributesEffective based on schema results and privilages Andrew Bartlett (This used to be commit dcff83ebe463bc7391841f55856d7915c204d000) --- source4/setup/provision | 6 +++--- source4/setup/provision_partitions.ldif | 6 +++--- source4/setup/provision_schema_basedn_modify.ldif | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) (limited to 'source4/setup') diff --git a/source4/setup/provision b/source4/setup/provision index 3c5d31dc0f..9a67d06963 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -132,11 +132,11 @@ if (ldapbackend) { subobj["LDAPMODULE"] = "entryUUID"; } subobj["DOMAINDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["DOMAINDN_MOD"] = subobj["LDAPMODULE"] + ",paged_searches"; + subobj["DOMAINDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; subobj["CONFIGDN_LDB"] = subobj["LDAPBACKEND"]; - subobj["CONFIGDN_MOD"] = subobj["LDAPMODULE"] + ",paged_searches"; + subobj["CONFIGDN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; subobj["SCHEMADN_LDB"] = subobj["LDAPBACKEND"]; - subobj["SCHEMADN_MOD"] = subobj["LDAPMODULE"] + ",paged_searches"; + subobj["SCHEMADN_MOD2"] = subobj["LDAPMODULE"] + ",paged_searches"; } if (!provision_validate(subobj, message)) { diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif index 3800918bc1..c6107c6502 100644 --- a/source4/setup/provision_partitions.ldif +++ b/source4/setup/provision_partitions.ldif @@ -5,9 +5,9 @@ partition: ${DOMAINDN}:${DOMAINDN_LDB} replicateEntries: @SUBCLASSES replicateEntries: @ATTRIBUTES replicateEntries: @INDEXLIST -modules:${SCHEMADN}:${SCHEMADN_MOD} -modules:${CONFIGDN}:${CONFIGDN_MOD} -modules:${DOMAINDN}:${DOMAINDN_MOD} +modules:${SCHEMADN}:${SCHEMADN_MOD}${SCHEMADN_MOD2} +modules:${CONFIGDN}:${CONFIGDN_MOD}${CONFIGDN_MOD2} +modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2} dn: @MODULES @LIST: ${MODULES_LIST} diff --git a/source4/setup/provision_schema_basedn_modify.ldif b/source4/setup/provision_schema_basedn_modify.ldif index 1f188d0679..a222a654f7 100644 --- a/source4/setup/provision_schema_basedn_modify.ldif +++ b/source4/setup/provision_schema_basedn_modify.ldif @@ -23,3 +23,21 @@ fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},C - replace: objectVersion objectVersion: 30 +- +replace: prefixMap +prefixMap:: QkRTRAAAAAAiAAAAAAACACIAAAAAAAAAAgAAAAQAAgABAAAAAgAAAAgAAgACAAAACA + AAAAwAAgADAAAACAAAABAAAgAEAAAACAAAABQAAgAFAAAACAAAABgAAgAGAAAACAAAABwAAgAHAAA + ACAAAACAAAgAIAAAAAgAAACQAAgAJAAAACAAAACgAAgAKAAAACAAAACwAAgATAAAACAAAADAAAgAU + AAAACAAAADQAAgAVAAAACQAAADgAAgAWAAAACQAAADwAAgAXAAAACgAAAEAAAgAYAAAAAgAAAEQAA + gAZAAAAAgAAAEgAAgAaAAAAAgAAAEwAAgALAAAACgAAAFAAAgAMAAAACQAAAFQAAgANAAAACgAAAF + gAAgAOAAAACQAAAFwAAgAPAAAACgAAAGAAAgAQAAAACQAAAGQAAgARAAAACQAAAGgAAgASAAAACgA + AAGwAAgAbAAAACQAAAHAAAgAcAAAACQAAAHQAAgAdAAAACAAAAHgAAgAeAAAACAAAAHwAAgAfAAAA + CQAAAIAAAgAgAAAACQAAAIQAAgAhAAAACQAAAIgAAgACAAAAVQQAAAIAAABVBgAACAAAACqGSIb3F + AECCAAAACqGSIb3FAEDCAAAAGCGSAFlAgIBCAAAAGCGSAFlAgIDCAAAAGCGSAFlAgEFCAAAAGCGSA + FlAgEEAgAAAFUFAAAIAAAAKoZIhvcUAQQIAAAAKoZIhvcUAQUIAAAACZImiZPyLGQIAAAAYIZIAYb + 4QgMJAAAACZImiZPyLGQBAAAACQAAAGCGSAGG+EIDAQAAAAoAAAAqhkiG9xQBBbZYAAACAAAAVRUA + AAIAAABVEgAAAgAAAFUUAAAKAAAAKoZIhvcUAQSCBAAACQAAACqGSIb3FAEFOAAAAAoAAAAqhkiG9 + xQBBIIGAAAJAAAAKoZIhvcUAQU5AAAACgAAACqGSIb3FAEEggcAAAkAAAAqhkiG9xQBBToAAAAJAA + AAKoZIhvcUAQVJAAAACgAAACqGSIb3FAEEgjEAAAkAAAArBgEEAYs6ZXcAAAAJAAAAYIZIAYb4QgM + CAAAACAAAACsGAQQBgXoBCAAAACqGSIb3DQEJCQAAAAmSJomT8ixkBAAAAAkAAAArBgEEAbd9BAEA + AAAJAAAAKwYBBAG3fQQC -- cgit