summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-10 14:08:38 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-18 11:45:31 +0200
commit390ada6ec79b0480a44da1fa81a63dcaf5c81da7 (patch)
treeda146da0b60a3107dafa01bda0a18bea71f1aa61
parentb8268cf7b0264ea28f684cbdfbf462e68a018d83 (diff)
downloadsamba-390ada6ec79b0480a44da1fa81a63dcaf5c81da7.tar.gz
samba-390ada6ec79b0480a44da1fa81a63dcaf5c81da7.tar.bz2
samba-390ada6ec79b0480a44da1fa81a63dcaf5c81da7.zip
Remove more usages of iconv_convenience in files which were apparently not recompiled by waf.
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c4
-rw-r--r--source4/kdc/hdb-samba4.c1
-rw-r--r--source4/torture/rap/rap.c4
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 34d4257df9..a2dab21c5d 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -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",
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index fc913292a0..f91eeb4073 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -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,
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 37edd20ed7..6543abd9f9 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -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;