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/scripting/libjs/provision.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source4/scripting') diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 9adcab2679..f94c34e932 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -611,7 +611,7 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb); if (!modify_ok) { if (!add_ok) { - message("Failed to both add and modify schema dn: + samdb.errstring() + "\n"); + message("Failed to both add and modify schema dn:" + samdb.errstring() + "\n"); message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); assert(modify_ok); } @@ -744,7 +744,7 @@ function provision_schema(subobj, message, tmp_schema_path, paths) var modify_ok = setup_ldb_modify("provision_schema_basedn_modify.ldif", info, samdb); if (!modify_ok) { if (!add_ok) { - message("Failed to both add and modify schema dn: + samdb.errstring() + "\n"); + message("Failed to both add and modify schema dn: " + samdb.errstring() + "\n"); message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); assert(modify_ok); } @@ -882,16 +882,18 @@ function provision_guess() "extended_dn", "asq", "samldb", - "password_hash", "operational", "objectclass", "rdn_name", "show_deleted", "partition"); subobj.MODULES_LIST = join(",", modules_list); - subobj.DOMAINDN_MOD = "objectguid"; - subobj.CONFIGDN_MOD = "objectguid"; - subobj.SCHEMADN_MOD = "objectguid"; + subobj.DOMAINDN_MOD = "pdc_fsmo,password_hash"; + subobj.CONFIGDN_MOD = "naming_fsmo"; + subobj.SCHEMADN_MOD = "schema_fsmo"; + subobj.DOMAINDN_MOD2 = ",objectguid"; + subobj.CONFIGDN_MOD2 = ",objectguid"; + subobj.SCHEMADN_MOD2 = ",objectguid"; subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb"; subobj.ACI = "# no aci for local ldb"; -- cgit