sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s3: Fix some more iconv convenience usages.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-05-14 17:39:07 +02:00
parent 390ada6ec7
commit c0fb7b8180
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/dsdb/samdb/ldb_modules/password_hash.c
View File

@ -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,

6
source4/torture/rap/rap.c
View File

@ -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;