summaryrefslogtreecommitdiff
path: root/source4/libcli/wrepl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-09 17:20:01 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-18 11:45:30 +0200
commitf9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch)
tree9a0a6cb6617d855c28eb891396898096c4214e88 /source4/libcli/wrepl
parente9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff)
downloadsamba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz
samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2
samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'source4/libcli/wrepl')
-rw-r--r--source4/libcli/wrepl/winsrepl.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index ec7e3798dc..75cb34f632 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -45,8 +45,6 @@ struct wrepl_socket {
#define WREPL_SOCKET_REQUEST_TIMEOUT (60)
uint32_t request_timeout;
- struct smb_iconv_convenience *iconv_convenience;
-
struct tevent_queue *request_queue;
struct tstream_context *stream;
@@ -70,8 +68,7 @@ bool wrepl_socket_is_connected(struct wrepl_socket *wrepl_sock)
operations will use that event context
*/
struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx,
- struct tevent_context *event_ctx,
- struct smb_iconv_convenience *iconv_convenience)
+ struct tevent_context *event_ctx)
{
struct wrepl_socket *wrepl_socket;
@@ -91,8 +88,6 @@ struct wrepl_socket *wrepl_socket_init(TALLOC_CTX *mem_ctx,
goto failed;
}
- wrepl_socket->iconv_convenience = iconv_convenience;
-
wrepl_socket->request_timeout = WREPL_SOCKET_REQUEST_TIMEOUT;
return wrepl_socket;
@@ -370,7 +365,6 @@ struct tevent_req *wrepl_request_send(TALLOC_CTX *mem_ctx,
state->req.wrap.packet = *packet;
ndr_err = ndr_push_struct_blob(&state->req.blob, state,
- wrepl_socket->iconv_convenience,
&state->req.wrap,
(ndr_push_flags_fn_t)ndr_push_wrepl_wrap);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -540,7 +534,6 @@ static void wrepl_request_read_pdu_done(struct tevent_req *subreq)
/* we have a full request - parse it */
ndr_err = ndr_pull_struct_blob(&blob,
state->rep.packet,
- state->caller.wrepl_socket->iconv_convenience,
state->rep.packet,
(ndr_pull_flags_fn_t)ndr_pull_wrepl_packet);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {