summaryrefslogtreecommitdiff
path: root/source4/dsdb/schema
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-10 00:42:06 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-18 11:45:31 +0200
commitb8268cf7b0264ea28f684cbdfbf462e68a018d83 (patch)
tree638192f21ae437a5c59ab2ec4500c9ea8c9f7b54 /source4/dsdb/schema
parentf9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (diff)
downloadsamba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.gz
samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.bz2
samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.zip
s3: Remove use of iconv_convenience.
Diffstat (limited to 'source4/dsdb/schema')
-rw-r--r--source4/dsdb/schema/schema.h2
-rw-r--r--source4/dsdb/schema/schema_syntax.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h
index d0ed62e1a7..9762a2ba98 100644
--- a/source4/dsdb/schema/schema.h
+++ b/source4/dsdb/schema/schema.h
@@ -215,8 +215,6 @@ struct dsdb_schema {
struct ldb_dn *master_dn;
} fsmo;
- struct smb_iconv_convenience *iconv_convenience;
-
/* Was this schema loaded from ldb (if so, then we will reload it when we detect a change in ldb) */
struct ldb_module *loaded_from_module;
struct dsdb_schema *(*refresh_fn)(struct ldb_module *module, struct dsdb_schema *schema, bool is_global_schema);
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 2e6f411a7a..e3ccab0904 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -1417,8 +1417,7 @@ static WERROR dsdb_syntax_UNICODE_validate_one_val(struct ldb_context *ldb,
return WERR_FOOBAR;
}
- ok = convert_string_talloc_convenience(ldb,
- schema->iconv_convenience,
+ ok = convert_string_talloc(ldb,
CH_UNIX, CH_UTF16,
val->data,
val->length,