From cfad782c9e422f11d6faa5a7e2b1b94400fe04bc Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Nov 2009 10:18:02 +1100 Subject: s4:dsdb Use new helper function to obtain CN=Aggregate schema DN in schema_data --- source4/dsdb/samdb/ldb_modules/schema_data.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/samdb/ldb_modules/schema_data.c b/source4/dsdb/samdb/ldb_modules/schema_data.c index 9951bd6da2..ed10ae6d69 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_data.c +++ b/source4/dsdb/samdb/ldb_modules/schema_data.c @@ -119,15 +119,15 @@ static int schema_data_init(struct ldb_module *module) return LDB_ERR_OPERATIONS_ERROR; } - /* Check to see if this is a result on the CN=Aggregate schema */ - data->aggregate_dn = ldb_dn_copy(data, schema_dn); - if (!ldb_dn_add_child_fmt(data->aggregate_dn, "CN=Aggregate")) { - ldb_oom(ldb); + data->schema_dn = schema_dn; + + /* Used to check to see if this is a result on the CN=Aggregate schema */ + data->aggregate_dn = samdb_aggregate_schema_dn(ldb, data); + if (!data->aggregate_dn) { + ldb_set_errstring(ldb, "Could not build aggregate schema DN"); return LDB_ERR_OPERATIONS_ERROR; } - data->schema_dn = schema_dn; - ldb_module_set_private(module, data); return LDB_SUCCESS; } -- cgit