diff options
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/schema/schema.h | 2 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 3 |
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, |