diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
| commit | 37d885c51a559d2be7dd15f46a80027e4f1dffef (patch) | |
| tree | 5e6fd2f9fb3463f8694ee9b6b022d0878737e0e6 /source4/dsdb/samdb/ldb_modules | |
| parent | 284f523ec70477c408887a478e8392671f12dfff (diff) | |
| download | samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.gz samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.bz2 samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.zip | |
Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 5ed7f1fbad..fc8fb775ee 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -1319,7 +1319,7 @@ static int setup_password_fields(struct setup_password_fields_io *io) ldb_oom(io->ac->module->ldb); return LDB_ERR_OPERATIONS_ERROR; } - converted_pw_len = convert_string_talloc(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), + converted_pw_len = convert_string_talloc_convenience(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), CH_UTF8, CH_UTF16, io->n.cleartext_utf8->data, io->n.cleartext_utf8->length, (void **)&cleartext_utf16_str); if (converted_pw_len == -1) { @@ -1337,7 +1337,7 @@ static int setup_password_fields(struct setup_password_fields_io *io) ldb_oom(io->ac->module->ldb); return LDB_ERR_OPERATIONS_ERROR; } - converted_pw_len = convert_string_talloc(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), + converted_pw_len = convert_string_talloc_convenience(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), CH_UTF16, CH_UTF8, io->n.cleartext_utf16->data, io->n.cleartext_utf16->length, (void **)&cleartext_utf8_str); if (converted_pw_len == -1) { @@ -1363,7 +1363,7 @@ static int setup_password_fields(struct setup_password_fields_io *io) if (io->n.cleartext_utf8) { struct samr_Password *lm_hash; char *cleartext_unix; - converted_pw_len = convert_string_talloc(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), + converted_pw_len = convert_string_talloc_convenience(io->ac, lp_iconv_convenience(ldb_get_opaque(io->ac->module->ldb, "loadparm")), CH_UTF8, CH_UNIX, io->n.cleartext_utf8->data, io->n.cleartext_utf8->length, (void **)&cleartext_unix); if (converted_pw_len != -1) { |