sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

s4:dsdb Search for the schema with dsdb_module_search(), in schema_fsmo

Browse Source 
This avoids using an ldb_search(), which would run from the top of the
module stack.  This will help us load the schema before the partitions
are initialised.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2009-10-10 09:10:03 +11:00
parent 1e5562ff04
commit c9f70fc3c7
2 changed files with 102 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
source4/dsdb/samdb/ldb_modules/schema_fsmo.c
View File

@ -5,6 +5,7 @@
checkings, it also loads the dsdb_schema.
Copyright (C) Stefan Metzmacher <metze@samba.org> 2007
Copyright (C) Andrew Bartlett <abartlet@samba.org> 2009
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -28,6 +29,7 @@
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "param/param.h"
#include "dsdb/samdb/ldb_modules/util.h"
static int generate_objectClasses(struct ldb_context *ldb, struct ldb_message *msg,
const struct dsdb_schema *schema);
@ -90,13 +92,107 @@ struct schema_fsmo_search_data {
const struct dsdb_schema *schema;
};
/*
Given an LDB module (pointing at the schema DB), and the DN, set the populated schema
*/
static int dsdb_schema_from_schema_dn(TALLOC_CTX *mem_ctx, struct ldb_module *module,
struct smb_iconv_convenience *iconv_convenience,
struct ldb_dn *schema_dn,
struct dsdb_schema **schema)
{
TALLOC_CTX *tmp_ctx;
char *error_string;
int ret;
struct ldb_context *ldb = ldb_module_get_ctx(module);
struct ldb_result *schema_res;
struct ldb_result *a_res;
struct ldb_result *c_res;
static const char *schema_attrs[] = {
"prefixMap",
"schemaInfo",
"fSMORoleOwner",
NULL
};
unsigned flags;
tmp_ctx = talloc_new(mem_ctx);
if (!tmp_ctx) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
/* we don't want to trace the schema load */
flags = ldb_get_flags(ldb);
ldb_set_flags(ldb, flags & ~LDB_FLG_ENABLE_TRACING);
/*
* setup the prefix mappings and schema info
*/
ret = dsdb_module_search_dn(module, tmp_ctx, &schema_res,
schema_dn, schema_attrs);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
goto failed;
} else if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"dsdb_schema: failed to search the schema head: %s",
ldb_errstring(ldb));
goto failed;
}
/*
* load the attribute definitions
*/
ret = dsdb_module_search(module, tmp_ctx, &a_res,
schema_dn, LDB_SCOPE_ONELEVEL, NULL,
"(objectClass=attributeSchema)");
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"dsdb_schema: failed to search attributeSchema objects: %s",
ldb_errstring(ldb));
goto failed;
}
/*
* load the objectClass definitions
*/
ret = dsdb_module_search(module, tmp_ctx, &c_res,
schema_dn, LDB_SCOPE_ONELEVEL, NULL,
"(objectClass=classSchema)");
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"dsdb_schema: failed to search attributeSchema objects: %s",
ldb_errstring(ldb));
goto failed;
}
ret = dsdb_schema_from_ldb_results(tmp_ctx, ldb,
lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
schema_res, a_res, c_res, schema, &error_string);
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"dsdb_schema load failed: %s",
error_string);
goto failed;
}
talloc_steal(mem_ctx, *schema);
failed:
if (flags & LDB_FLG_ENABLE_TRACING) {
flags = ldb_get_flags(ldb);
ldb_set_flags(ldb, flags | LDB_FLG_ENABLE_TRACING);
}
talloc_free(tmp_ctx);
return ret;
}
static int schema_fsmo_init(struct ldb_module *module)
{
struct ldb_context *ldb;
TALLOC_CTX *mem_ctx;
struct ldb_dn *schema_dn;
struct dsdb_schema *schema;
char *error_string = NULL;
int ret;
struct schema_fsmo_private_data *data;
@ -134,9 +230,9 @@ static int schema_fsmo_init(struct ldb_module *module)
return LDB_ERR_OPERATIONS_ERROR;
}
ret = dsdb_schema_from_schema_dn(mem_ctx, ldb,
ret = dsdb_schema_from_schema_dn(mem_ctx, module,
lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
schema_dn, &schema, &error_string);
schema_dn, &schema);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
ldb_reset_err_string(ldb);
@ -147,9 +243,6 @@ static int schema_fsmo_init(struct ldb_module *module)
}
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"schema_fsmo_init: dsdb_schema load failed: %s",
error_string);
talloc_free(mem_ctx);
return ret;
}
@ -246,7 +339,6 @@ static int schema_fsmo_extended(struct ldb_module *module, struct ldb_request *r
struct ldb_context *ldb;
struct ldb_dn *schema_dn;
struct dsdb_schema *schema;
char *error_string = NULL;
int ret;
TALLOC_CTX *mem_ctx;
@ -270,9 +362,9 @@ static int schema_fsmo_extended(struct ldb_module *module, struct ldb_request *r
return LDB_ERR_OPERATIONS_ERROR;
}
ret = dsdb_schema_from_schema_dn(mem_ctx, ldb,
ret = dsdb_schema_from_schema_dn(mem_ctx, module,
lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
schema_dn, &schema, &error_string);
schema_dn, &schema);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
ldb_reset_err_string(ldb);
@ -283,9 +375,6 @@ static int schema_fsmo_extended(struct ldb_module *module, struct ldb_request *r
}
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb,
"schema_fsmo_extended: dsdb_schema load failed: %s",
error_string);
talloc_free(mem_ctx);
return ldb_next_request(module, req);
}

111
source4/dsdb/schema/schema_init.c
View File

@ -906,7 +906,7 @@ WERROR dsdb_class_from_ldb(const struct dsdb_schema *schema,
/*
Create a DSDB schema from the ldb results provided. This is called
directly when the schema is provisioned from an on-disk LDIF file, or
from dsdb_schema_from_schema_dn below
from dsdb_schema_from_schema_dn in schema_fsmo
*/
int dsdb_schema_from_ldb_results(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
@ -1013,115 +1013,6 @@ int dsdb_schema_from_ldb_results(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
return LDB_SUCCESS;
}
/*
Given an LDB, and the DN, return a populated schema
*/
int dsdb_schema_from_schema_dn(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
struct smb_iconv_convenience *iconv_convenience,
struct ldb_dn *schema_dn,
struct dsdb_schema **schema,
char **error_string_out)
{
TALLOC_CTX *tmp_ctx;
char *error_string;
int ret;
struct ldb_result *schema_res;
struct ldb_result *a_res;
struct ldb_result *c_res;
static const char *schema_attrs[] = {
"prefixMap",
"schemaInfo",
"fSMORoleOwner",
NULL
};
unsigned flags;
tmp_ctx = talloc_new(mem_ctx);
if (!tmp_ctx) {
dsdb_oom(error_string_out, mem_ctx);
return LDB_ERR_OPERATIONS_ERROR;
}
/* we don't want to trace the schema load */
flags = ldb_get_flags(ldb);
ldb_set_flags(ldb, flags & ~LDB_FLG_ENABLE_TRACING);
/*
* setup the prefix mappings and schema info
*/
ret = ldb_search(ldb, tmp_ctx, &schema_res,
schema_dn, LDB_SCOPE_BASE, schema_attrs, NULL);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
goto failed;
} else if (ret != LDB_SUCCESS) {
*error_string_out = talloc_asprintf(mem_ctx,
"dsdb_schema: failed to search the schema head: %s",
ldb_errstring(ldb));
goto failed;
}
if (schema_res->count != 1) {
*error_string_out = talloc_asprintf(mem_ctx,
"dsdb_schema: [%u] schema heads found on a base search",
schema_res->count);
goto failed;
}
/*
* load the attribute definitions
*/
ret = ldb_search(ldb, tmp_ctx, &a_res,
schema_dn, LDB_SCOPE_ONELEVEL, NULL,
"(objectClass=attributeSchema)");
if (ret != LDB_SUCCESS) {
*error_string_out = talloc_asprintf(mem_ctx,
"dsdb_schema: failed to search attributeSchema objects: %s",
ldb_errstring(ldb));
goto failed;
}
/*
* load the objectClass definitions
*/
ret = ldb_search(ldb, tmp_ctx, &c_res,
schema_dn, LDB_SCOPE_ONELEVEL, NULL,
"(objectClass=classSchema)");
if (ret != LDB_SUCCESS) {
*error_string_out = talloc_asprintf(mem_ctx,
"dsdb_schema: failed to search attributeSchema objects: %s",
ldb_errstring(ldb));
goto failed;
}
ret = dsdb_schema_from_ldb_results(tmp_ctx, ldb,
lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
schema_res, a_res, c_res, schema, &error_string);
if (ret != LDB_SUCCESS) {
*error_string_out = talloc_asprintf(mem_ctx,
"dsdb_schema load failed: %s",
error_string);
goto failed;
}
talloc_steal(mem_ctx, *schema);
talloc_free(tmp_ctx);
if (flags & LDB_FLG_ENABLE_TRACING) {
flags = ldb_get_flags(ldb);
ldb_set_flags(ldb, flags | LDB_FLG_ENABLE_TRACING);
}
return LDB_SUCCESS;
failed:
if (flags & LDB_FLG_ENABLE_TRACING) {
flags = ldb_get_flags(ldb);
ldb_set_flags(ldb, flags | LDB_FLG_ENABLE_TRACING);
}
talloc_free(tmp_ctx);
return ret;
}
static const struct {
const char *name;