From b8268cf7b0264ea28f684cbdfbf462e68a018d83 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 May 2010 00:42:06 +0200 Subject: s3: Remove use of iconv_convenience. --- source4/auth/ntlm/auth_server.c | 1 - source4/dsdb/schema/schema.h | 2 -- source4/dsdb/schema/schema_syntax.c | 3 +-- source4/kdc/mit_samba.c | 3 --- source4/kdc/pac-glue.h | 1 - source4/kdc/samba_kdc.h | 1 - source4/kdc/wdc-samba4.c | 1 - source4/libcli/dgram/libdgram.h | 1 - source4/libcli/raw/libcliraw.h | 3 --- source4/libcli/smb_composite/fetchfile.c | 1 - source4/libcli/smb_composite/fsinfo.c | 1 - source4/libcli/smb_composite/smb_composite.h | 3 --- source4/ntvfs/cifs/vfs_cifs.c | 1 - source4/torture/basic/misc.c | 1 - source4/torture/raw/composite.c | 2 -- source4/torture/raw/lockbench.c | 1 - 16 files changed, 1 insertion(+), 25 deletions(-) (limited to 'source4') diff --git a/source4/auth/ntlm/auth_server.c b/source4/auth/ntlm/auth_server.c index ae7b7dd3a8..6bb07987b5 100644 --- a/source4/auth/ntlm/auth_server.c +++ b/source4/auth/ntlm/auth_server.c @@ -81,7 +81,6 @@ static NTSTATUS server_get_challenge(struct auth_method_context *ctx, TALLOC_CTX io.in.options = smb_options; - io.in.iconv_convenience = lp_iconv_convenience(ctx->auth_ctx->lp_ctx); lp_smbcli_session_options(ctx->auth_ctx->lp_ctx, &io.in.session_options); status = smb_composite_connect(&io, mem_ctx, lp_resolve_context(ctx->auth_ctx->lp_ctx), diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h index d0ed62e1a7..9762a2ba98 100644 --- a/source4/dsdb/schema/schema.h +++ b/source4/dsdb/schema/schema.h @@ -215,8 +215,6 @@ struct dsdb_schema { struct ldb_dn *master_dn; } fsmo; - struct smb_iconv_convenience *iconv_convenience; - /* Was this schema loaded from ldb (if so, then we will reload it when we detect a change in ldb) */ struct ldb_module *loaded_from_module; struct dsdb_schema *(*refresh_fn)(struct ldb_module *module, struct dsdb_schema *schema, bool is_global_schema); diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 2e6f411a7a..e3ccab0904 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -1417,8 +1417,7 @@ static WERROR dsdb_syntax_UNICODE_validate_one_val(struct ldb_context *ldb, return WERR_FOOBAR; } - ok = convert_string_talloc_convenience(ldb, - schema->iconv_convenience, + ok = convert_string_talloc(ldb, CH_UNIX, CH_UTF16, val->data, val->length, diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c index 328124c409..7718e56d65 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -98,8 +98,6 @@ static int mit_samba_context_init(struct mit_samba_context **_ctx) cli_credentials_set_kerberos_state(ctx->session_info->credentials, CRED_DONT_USE_KERBEROS); - ctx->db_ctx->ic_ctx = lp_iconv_convenience(ctx->db_ctx->lp_ctx); - ctx->db_ctx->samdb = samdb_connect(ctx, ctx->db_ctx->ev_ctx, ctx->db_ctx->lp_ctx, @@ -275,7 +273,6 @@ static int mit_samba_update_pac_data(struct mit_samba_context *ctx, } nt_status = samba_kdc_update_pac_blob(tmp_ctx, ctx->context, - ctx->db_ctx->ic_ctx, &pac, logon_blob); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Building PAC failed: %s\n", diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h index a1f0b37fdd..4723a72b07 100644 --- a/source4/kdc/pac-glue.h +++ b/source4/kdc/pac-glue.h @@ -33,7 +33,6 @@ NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx, NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx, krb5_context context, - struct smb_iconv_convenience *ic, krb5_pac *pac, DATA_BLOB *pac_blob); void samba_kdc_build_edata_reply(NTSTATUS nt_status, DATA_BLOB *e_data); diff --git a/source4/kdc/samba_kdc.h b/source4/kdc/samba_kdc.h index fcaf3b9704..bfa868f422 100644 --- a/source4/kdc/samba_kdc.h +++ b/source4/kdc/samba_kdc.h @@ -31,7 +31,6 @@ struct samba_kdc_seq; struct samba_kdc_db_context { struct tevent_context *ev_ctx; struct loadparm_context *lp_ctx; - struct smb_iconv_convenience *ic_ctx; struct ldb_context *samdb; struct samba_kdc_seq *seq_ctx; }; diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index ce8f542ee2..0ebc4e7c2b 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -85,7 +85,6 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, krb5_context context, } nt_status = samba_kdc_update_pac_blob(mem_ctx, context, - p->kdc_db_ctx->ic_ctx, pac, pac_blob); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Building PAC failed: %s\n", diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h index d122281909..a5d1b94e3a 100644 --- a/source4/libcli/dgram/libdgram.h +++ b/source4/libcli/dgram/libdgram.h @@ -40,7 +40,6 @@ struct nbt_dgram_request { struct nbt_dgram_socket { struct socket_context *sock; struct tevent_context *event_ctx; - struct smb_iconv_convenience *iconv_convenience; /* the fd event */ struct tevent_fd *fde; diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index a278597baf..40813f3729 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -164,9 +164,6 @@ struct smbcli_transport { /* context of the stream -> packet parser */ struct packet_context *packet; - - /* iconv convenience */ - struct smb_iconv_convenience *iconv_convenience; }; /* this is the context for the user */ diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c index 210a2940b9..d19c86a8d0 100644 --- a/source4/libcli/smb_composite/fetchfile.c +++ b/source4/libcli/smb_composite/fetchfile.c @@ -146,7 +146,6 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc state->connect->in.fallback_to_anonymous = false; state->connect->in.workgroup = io->in.workgroup; state->connect->in.gensec_settings = io->in.gensec_settings; - state->connect->in.iconv_convenience = io->in.iconv_convenience; state->connect->in.options = io->in.options; state->connect->in.session_options = io->in.session_options; diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c index 3bc93b62ab..6537ef8c92 100644 --- a/source4/libcli/smb_composite/fsinfo.c +++ b/source4/libcli/smb_composite/fsinfo.c @@ -153,7 +153,6 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree, state->connect->in.credentials = io->in.credentials; state->connect->in.fallback_to_anonymous = false; state->connect->in.workgroup = io->in.workgroup; - state->connect->in.iconv_convenience = io->in.iconv_convenience; state->connect->in.gensec_settings = io->in.gensec_settings; state->connect->in.options = tree->session->transport->options; diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index a1e1e99d7e..448e05a6ed 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -60,7 +60,6 @@ struct smb_composite_fetchfile { struct smbcli_options options; struct smbcli_session_options session_options; struct resolve_context *resolve_ctx; - struct smb_iconv_convenience *iconv_convenience; struct gensec_settings *gensec_settings; } in; struct { @@ -104,7 +103,6 @@ struct smb_composite_connect { const char *workgroup; struct smbcli_options options; struct smbcli_session_options session_options; - struct smb_iconv_convenience *iconv_convenience; struct gensec_settings *gensec_settings; } in; struct { @@ -145,7 +143,6 @@ struct smb_composite_fsinfo { struct cli_credentials *credentials; const char *workgroup; enum smb_fsinfo_level level; - struct smb_iconv_convenience *iconv_convenience; struct gensec_settings *gensec_settings; } in; diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index ffcd5f13e4..9821d2751b 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -239,7 +239,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, io.in.workgroup = lp_workgroup(ntvfs->ctx->lp_ctx); io.in.service = remote_share; io.in.service_type = "?????"; - io.in.iconv_convenience = lp_iconv_convenience(ntvfs->ctx->lp_ctx); io.in.gensec_settings = lp_gensec_settings(p, ntvfs->ctx->lp_ctx); lp_smbcli_options(ntvfs->ctx->lp_ctx, &io.in.options); lp_smbcli_session_options(ntvfs->ctx->lp_ctx, &io.in.session_options); diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 40a61400f7..24e8e37331 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -883,7 +883,6 @@ static struct composite_context *torture_connect_async( smb->in.service_type=NULL; smb->in.credentials=cmdline_credentials; smb->in.fallback_to_anonymous=false; - smb->in.iconv_convenience = lp_iconv_convenience(tctx->lp_ctx); smb->in.gensec_settings = lp_gensec_settings(mem_ctx, tctx->lp_ctx); smb->in.workgroup=workgroup; lp_smbcli_options(tctx->lp_ctx, &smb->in.options); diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 73a25fd345..bcc030b5ab 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -163,7 +163,6 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct io2.in.workgroup = lp_workgroup(tctx->lp_ctx); io2.in.filename = fname; io2.in.resolve_ctx = lp_resolve_context(tctx->lp_ctx); - io2.in.iconv_convenience = lp_iconv_convenience(tctx->lp_ctx); io2.in.gensec_settings = lp_gensec_settings(tctx, tctx->lp_ctx); lp_smbcli_options(tctx->lp_ctx, &io2.in.options); lp_smbcli_session_options(tctx->lp_ctx, &io2.in.session_options); @@ -355,7 +354,6 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx) io1.in.credentials = cmdline_credentials; io1.in.workgroup = lp_workgroup(tctx->lp_ctx); io1.in.level = RAW_QFS_OBJECTID_INFORMATION; - io1.in.iconv_convenience = lp_iconv_convenience(tctx->lp_ctx); io1.in.gensec_settings = lp_gensec_settings(tctx, tctx->lp_ctx); printf("Testing parallel queryfsinfo [Object ID] with %d ops\n", diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index 98ca5f37a4..315e4241f9 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -195,7 +195,6 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te io->in.credentials = cmdline_credentials; io->in.fallback_to_anonymous = false; io->in.workgroup = lp_workgroup(state->tctx->lp_ctx); - io->in.iconv_convenience = lp_iconv_convenience(state->tctx->lp_ctx); lp_smbcli_options(state->tctx->lp_ctx, &io->in.options); lp_smbcli_session_options(state->tctx->lp_ctx, &io->in.session_options); -- cgit