s4:dsdb Use the new flags to dsdb_module_search in schema_load
authorAndrew Bartlett <abartlet@samba.org>
Mon, 16 Nov 2009 07:37:51 +0000 (18:37 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 16 Nov 2009 23:38:01 +0000 (10:38 +1100)
This loads the defaultObjectCategory DN as an extended DN, so we can
apply it, with the associated GUID, when setting this on records in
the objectClass module.

Previously we would not store the extended DN components for
objectCategory.

Andrew Bartlett

source4/dsdb/samdb/ldb_modules/schema_load.c

index b695700123fa297b4d26df7ba71dbc1f71882dad..c7cd76a395af75593605f7d43f65756f2a0cc62f 100644 (file)
@@ -69,7 +69,7 @@ static int dsdb_schema_from_schema_dn(TALLOC_CTX *mem_ctx, struct ldb_module *mo
         * setup the prefix mappings and schema info
         */
        ret = dsdb_module_search_dn(module, tmp_ctx, &schema_res,
-                                   schema_dn, schema_attrs);
+                                   schema_dn, schema_attrs, 0);
        if (ret == LDB_ERR_NO_SUCH_OBJECT) {
                goto failed;
        } else if (ret != LDB_SUCCESS) {
@@ -84,6 +84,7 @@ static int dsdb_schema_from_schema_dn(TALLOC_CTX *mem_ctx, struct ldb_module *mo
         */
        ret = dsdb_module_search(module, tmp_ctx, &a_res,
                                 schema_dn, LDB_SCOPE_ONELEVEL, NULL,
+                                0, 
                                 "(objectClass=attributeSchema)");
        if (ret != LDB_SUCCESS) {
                ldb_asprintf_errstring(ldb, 
@@ -97,6 +98,7 @@ static int dsdb_schema_from_schema_dn(TALLOC_CTX *mem_ctx, struct ldb_module *mo
         */
        ret = dsdb_module_search(module, tmp_ctx, &c_res,
                                 schema_dn, LDB_SCOPE_ONELEVEL, NULL,
+                                DSDB_SEARCH_SHOW_DN_IN_STORAGE_FORMAT,
                                 "(objectClass=classSchema)");
        if (ret != LDB_SUCCESS) {
                ldb_asprintf_errstring(ldb,