diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-14 17:39:07 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:31 +0200 |
| commit | c0fb7b8180f7383590f24e84cc3700aa77499112 (patch) | |
| tree | 0a2ee2b75ab6b6f7cd2c27e4a5832457cad0c135 | |
| parent | 390ada6ec79b0480a44da1fa81a63dcaf5c81da7 (diff) | |
| download | samba-c0fb7b8180f7383590f24e84cc3700aa77499112.tar.gz samba-c0fb7b8180f7383590f24e84cc3700aa77499112.tar.bz2 samba-c0fb7b8180f7383590f24e84cc3700aa77499112.zip | |
s3: Fix some more iconv convenience usages.
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 2 | ||||
| -rw-r--r-- | source4/torture/rap/rap.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index de2c6da94c..58ab6f7b30 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -1351,7 +1351,7 @@ static int setup_given_passwords(struct setup_password_fields_io *io, ldb_oom(ldb); return LDB_ERR_OPERATIONS_ERROR; } - if (!convert_string_talloc_convenience(io->ac, + if (!convert_string_talloc(io->ac, CH_UTF16MUNGED, CH_UTF8, g->cleartext_utf16->data, g->cleartext_utf16->length, diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 6543abd9f9..e0c9277869 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -234,7 +234,7 @@ static NTSTATUS rap_cli_do_call(struct smbcli_tree *tree, params->flags = RAPNDR_FLAGS; - data = ndr_push_init_ctx(call, iconv_convenience); + data = ndr_push_init_ctx(call); if (data == NULL) return NT_STATUS_NO_MEMORY; @@ -1649,7 +1649,7 @@ NTSTATUS smbcli_rap_netoemchangepassword(struct smbcli_tree *tree, struct rap_call *call; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_SamOEMChgPasswordUser2_P))) { + if (!(call = new_rap_cli_call(mem_ctx, RAP_SamOEMChgPasswordUser2_P))) { return NT_STATUS_NO_MEMORY; } @@ -1664,7 +1664,7 @@ NTSTATUS smbcli_rap_netoemchangepassword(struct smbcli_tree *tree, NDR_PRINT_IN_DEBUG(rap_NetOEMChangePassword, r); } - result = rap_cli_do_call(tree, iconv_convenience, call); + result = rap_cli_do_call(tree, call); if (!NT_STATUS_IS_OK(result)) goto done; |