From f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 9 May 2010 17:20:01 +0200 Subject: Finish removal of iconv_convenience in public API's. --- source4/torture/drs/unit/prefixmap_tests.c | 6 +++--- source4/torture/drs/unit/schemainfo_tests.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/torture/drs/unit') diff --git a/source4/torture/drs/unit/prefixmap_tests.c b/source4/torture/drs/unit/prefixmap_tests.c index 4282e26a6c..a4521eb675 100644 --- a/source4/torture/drs/unit/prefixmap_tests.c +++ b/source4/torture/drs/unit/prefixmap_tests.c @@ -500,7 +500,7 @@ static bool torture_drs_unit_pfm_to_from_ldb_val(struct torture_context *tctx, s mem_ctx = talloc_new(tctx); torture_assert(tctx, mem_ctx, "Unexpected: Have no memory!"); - schema = dsdb_new_schema(mem_ctx, lp_iconv_convenience(tctx->lp_ctx)); + schema = dsdb_new_schema(mem_ctx); torture_assert(tctx, schema, "Unexpected: failed to allocate schema object"); /* set priv->pfm_full as prefixMap for new schema object */ @@ -552,7 +552,7 @@ static bool torture_drs_unit_pfm_read_write_ldb(struct torture_context *tctx, st torture_assert(tctx, mem_ctx, "Unexpected: Have no memory!"); /* makeup a dsdb_schema to test with */ - schema = dsdb_new_schema(mem_ctx, lp_iconv_convenience(tctx->lp_ctx)); + schema = dsdb_new_schema(mem_ctx); torture_assert(tctx, schema, "Unexpected: failed to allocate schema object"); /* set priv->pfm_full as prefixMap for new schema object */ schema->prefixmap = priv->pfm_full; @@ -606,7 +606,7 @@ static bool torture_drs_unit_dsdb_create_prefix_mapping(struct torture_context * torture_assert(tctx, mem_ctx, "Unexpected: Have no memory!"); /* makeup a dsdb_schema to test with */ - schema = dsdb_new_schema(mem_ctx, lp_iconv_convenience(tctx->lp_ctx)); + schema = dsdb_new_schema(mem_ctx); torture_assert(tctx, schema, "Unexpected: failed to allocate schema object"); /* set priv->pfm_full as prefixMap for new schema object */ schema->schema_info = priv->schi_default_str; diff --git a/source4/torture/drs/unit/schemainfo_tests.c b/source4/torture/drs/unit/schemainfo_tests.c index f197b479e9..a69e8a80cc 100644 --- a/source4/torture/drs/unit/schemainfo_tests.c +++ b/source4/torture/drs/unit/schemainfo_tests.c @@ -513,7 +513,7 @@ static bool torture_drs_unit_schemainfo_setup(struct torture_context *tctx, torture_assert(tctx, priv->ldb_module, "Not enough memory!"); /* create schema mockup object */ - priv->schema = dsdb_new_schema(priv, lp_iconv_convenience(tctx->lp_ctx)); + priv->schema = dsdb_new_schema(priv); /* pre-cache invocationId for samdb_ntds_invocation_id() * to work with our mock ldb */ -- cgit