summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-05-21 23:51:28 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 17:19:12 +0200
commit3fe793fce7060c785576bb5f3d7039df60bc7b1d (patch)
tree777e7ad47d8152c87054498d7c9126a4f8e0056c
parente1f22174e172971ef8b0460da076a138b1fa73e4 (diff)
downloadsamba-3fe793fce7060c785576bb5f3d7039df60bc7b1d.tar.gz
samba-3fe793fce7060c785576bb5f3d7039df60bc7b1d.tar.bz2
samba-3fe793fce7060c785576bb5f3d7039df60bc7b1d.zip
Remove iconv convenience in used functions, which were deleted in commit f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
-rw-r--r--source4/lib/policy/gp_filesys.c1
-rw-r--r--source4/lib/policy/gp_ldap.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/source4/lib/policy/gp_filesys.c b/source4/lib/policy/gp_filesys.c
index f6183bd8e1..6248d401e7 100644
--- a/source4/lib/policy/gp_filesys.c
+++ b/source4/lib/policy/gp_filesys.c
@@ -181,7 +181,6 @@ static NTSTATUS gp_cli_connect(struct gp_context *gp_ctx)
gp_ctx->ev_ctx,
&options,
&session_options,
- lp_iconv_convenience(gp_ctx->lp_ctx),
lp_gensec_settings(gp_ctx, gp_ctx->lp_ctx));
return NT_STATUS_OK;
diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c
index 730c4d8e0b..5c60e94dcb 100644
--- a/source4/lib/policy/gp_ldap.c
+++ b/source4/lib/policy/gp_ldap.c
@@ -80,7 +80,6 @@ static NTSTATUS parse_gpo(TALLOC_CTX *mem_ctx, struct ldb_message *msg, struct g
gpo->security_descriptor = talloc(mem_ctx, struct security_descriptor);
ndr_err = ndr_pull_struct_blob(data,
mem_ctx,
- NULL,
gpo->security_descriptor,
(ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -883,7 +882,6 @@ NTSTATUS gp_set_ads_acl (struct gp_context *gp_ctx, const char *dn_str, const st
/* Push the security descriptor through the NDR library */
ndr_err = ndr_push_struct_blob(&data,
mem_ctx,
- lp_iconv_convenience(gp_ctx->lp_ctx),
sd,
(ndr_push_flags_fn_t)ndr_push_security_descriptor);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {