Finish removal of iconv_convenience in public API's.

[sfrench/samba-autobuild/.git] / source4 / rpc_server / service_rpc.c

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 906b02dc9ec4099f224399709a300ed441db3f14..05e45d852906a4b7ed0907dfd274362fa1746c18 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -133,27 +133,8 @@ static void dcesrv_sock_reply_done(struct tevent_req *subreq)
        }
 }
 
-static struct socket_address *dcesrv_sock_get_my_addr(struct dcesrv_connection *dcesrv_conn, TALLOC_CTX *mem_ctx)
-{
-       struct stream_connection *srv_conn;
-       srv_conn = talloc_get_type(dcesrv_conn->transport.private_data,
-                                  struct stream_connection);
-
-       return socket_get_my_addr(srv_conn->socket, mem_ctx);
-}
-
-static struct socket_address *dcesrv_sock_get_peer_addr(struct dcesrv_connection *dcesrv_conn, TALLOC_CTX *mem_ctx)
-{
-       struct stream_connection *srv_conn;
-       srv_conn = talloc_get_type(dcesrv_conn->transport.private_data,
-                                  struct stream_connection);
-
-       return socket_get_peer_addr(srv_conn->socket, mem_ctx);
-}
-
 struct dcerpc_read_ncacn_packet_state {
        struct {
-               struct smb_iconv_convenience *smb_iconv_c;
        } caller;
        DATA_BLOB buffer;
        struct ncacn_packet *pkt;
@@ -168,8 +149,7 @@ static void dcerpc_read_ncacn_packet_done(struct tevent_req *subreq);
 
 static struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,
-                                                struct tstream_context *stream,
-                                                struct smb_iconv_convenience *ic)
+                                                struct tstream_context *stream)
 {
        struct tevent_req *req;
        struct dcerpc_read_ncacn_packet_state *state;
@@ -181,7 +161,6 @@ static struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       state->caller.smb_iconv_c = ic;
        state->buffer = data_blob_const(NULL, 0);
        state->pkt = talloc(state, struct ncacn_packet);
        if (tevent_req_nomem(state->pkt, req)) {
@@ -278,9 +257,7 @@ static void dcerpc_read_ncacn_packet_done(struct tevent_req *subreq)
                return;
        }
 
-       ndr = ndr_pull_init_blob(&state->buffer,
-                                state->pkt,
-                                state->caller.smb_iconv_c);
+       ndr = ndr_pull_init_blob(&state->buffer, state->pkt);
        if (tevent_req_nomem(ndr, req)) {
                return;
        }
@@ -410,8 +387,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
 
        subreq = dcerpc_read_ncacn_packet_send(dcesrv_conn,
                                               dcesrv_conn->event_ctx,
-                                              dcesrv_conn->stream,
-                                              lp_iconv_convenience(lp_ctx));
+                                              dcesrv_conn->stream);
        if (!subreq) {
                status = NT_STATUS_NO_MEMORY;
                DEBUG(0,("dcesrv_sock_accept: dcerpc_read_fragment_buffer_send(%s)\n",
@@ -431,7 +407,6 @@ static void dcesrv_read_fragment_done(struct tevent_req *subreq)
        struct ncacn_packet *pkt;
        DATA_BLOB buffer;
        NTSTATUS status;
-       struct loadparm_context *lp_ctx = dce_conn->dce_ctx->lp_ctx;
 
        status = dcerpc_read_ncacn_packet_recv(subreq, dce_conn,
                                               &pkt, &buffer);
@@ -449,8 +424,7 @@ static void dcesrv_read_fragment_done(struct tevent_req *subreq)
 
        subreq = dcerpc_read_ncacn_packet_send(dce_conn,
                                               dce_conn->event_ctx,
-                                              dce_conn->stream,
-                                              lp_iconv_convenience(lp_ctx));
+                                              dce_conn->stream);
        if (!subreq) {
                status = NT_STATUS_NO_MEMORY;
                dcesrv_terminate_connection(dce_conn, nt_errstr(status));