From f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 9 May 2010 17:20:01 +0200 Subject: Finish removal of iconv_convenience in public API's. --- source4/smbd/server.c | 4 +--- source4/smbd/service_named_pipe.c | 2 -- source4/smbd/service_stream.c | 4 +--- source4/smbd/service_task.c | 1 - 4 files changed, 2 insertions(+), 9 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 149421532f..88917c4f38 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -219,9 +219,7 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, msg = messaging_init(talloc_autofree_context(), lp_messaging_path(event_ctx, lp_ctx), - cluster_id(0, SAMBA_PARENT_TASKID), - lp_iconv_convenience(lp_ctx), - event_ctx); + cluster_id(0, SAMBA_PARENT_TASKID), event_ctx); NT_STATUS_HAVE_NO_MEMORY(msg); irpc_add_name(msg, "samba"); diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c index bce663ba8e..d78fd72cc2 100644 --- a/source4/smbd/service_named_pipe.c +++ b/source4/smbd/service_named_pipe.c @@ -211,7 +211,6 @@ static void named_pipe_auth_request(struct tevent_req *subreq) ndr_err = ndr_pull_struct_blob_all( &call->in, pipe_conn, - lp_iconv_convenience(conn->lp_ctx), &pipe_request, (ndr_pull_flags_fn_t) ndr_pull_named_pipe_auth_req); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { @@ -480,7 +479,6 @@ static void named_pipe_auth_request(struct tevent_req *subreq) reply: /* create the output */ ndr_err = ndr_push_struct_blob(&call->out, pipe_conn, - lp_iconv_convenience(conn->lp_ctx), &pipe_reply, (ndr_push_flags_fn_t)ndr_push_named_pipe_auth_rep); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 043720597c..8c38f27d74 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -188,9 +188,7 @@ static void stream_new_connection(struct tevent_context *ev, /* setup to receive internal messages on this connection */ srv_conn->msg_ctx = messaging_init(srv_conn, lp_messaging_path(srv_conn, lp_ctx), - srv_conn->server_id, - lp_iconv_convenience(lp_ctx), - ev); + srv_conn->server_id, ev); if (!srv_conn->msg_ctx) { stream_terminate_connection(srv_conn, "messaging_init() failed"); return; diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index d5d3eef59c..55f2fa24b8 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -81,7 +81,6 @@ static void task_server_callback(struct tevent_context *event_ctx, task->msg_ctx = messaging_init(task, lp_messaging_path(task, task->lp_ctx), task->server_id, - lp_iconv_convenience(task->lp_ctx), task->event_ctx); if (!task->msg_ctx) { task_server_terminate(task, "messaging_init() failed", true); -- cgit