sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Remove more usages of iconv_convenience in files which were apparently not recompiled by waf.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-05-10 14:08:38 +02:00
parent b8268cf7b0
commit 390ada6ec7
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/dsdb/samdb/ldb_modules/operational.c
View File

@ -468,9 +468,7 @@ static int construct_msds_keyversionnumber(struct ldb_module *module, struct ldb
return LDB_SUCCESS;
}
ndr_err = ndr_pull_struct_blob(omd_value, omd,
lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")),
omd,
ndr_err = ndr_pull_struct_blob(omd_value, omd, omd,
(ndr_pull_flags_fn_t)ndr_pull_replPropertyMetaDataBlob);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
DEBUG(0,(__location__ ": Failed to parse replPropertyMetaData for %s when trying to add msDS-KeyVersionNumber\n",

1
source4/kdc/hdb-samba4.c
View File

@ -220,7 +220,6 @@ NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx,
}
kdc_db_ctx->ev_ctx = base_ctx->ev_ctx;
kdc_db_ctx->lp_ctx = base_ctx->lp_ctx;
kdc_db_ctx->ic_ctx = lp_iconv_convenience(base_ctx->lp_ctx);
/* Setup the link to LDB */
kdc_db_ctx->samdb = samdb_connect(kdc_db_ctx, base_ctx->ev_ctx,

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

@ -1594,7 +1594,7 @@ NTSTATUS smbcli_rap_netuserpasswordset2(struct smbcli_tree *tree,
struct rap_call *call;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WUserPasswordSet2))) {
if (!(call = new_rap_cli_call(mem_ctx, RAP_WUserPasswordSet2))) {
return NT_STATUS_NO_MEMORY;
}
@ -1616,7 +1616,7 @@ NTSTATUS smbcli_rap_netuserpasswordset2(struct smbcli_tree *tree,
NDR_PRINT_IN_DEBUG(rap_NetUserPasswordSet2, 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;