diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-10 00:42:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:31 +0200 |
| commit | b8268cf7b0264ea28f684cbdfbf462e68a018d83 (patch) | |
| tree | 638192f21ae437a5c59ab2ec4500c9ea8c9f7b54 /source3/rpc_client | |
| parent | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (diff) | |
| download | samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.gz samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.bz2 samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.zip | |
s3: Remove use of iconv_convenience.
Diffstat (limited to 'source3/rpc_client')
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 2 | ||||
| -rw-r--r-- | source3/rpc_client/init_spoolss.c | 4 | ||||
| -rw-r--r-- | source3/rpc_client/ndr.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index e7c4ec197f..210f1389fd 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -1786,7 +1786,7 @@ static NTSTATUS create_schannel_auth_rpc_bind_req( struct rpc_pipe_client *cli, r.oem_netbios_domain.a = cli->auth->domain; r.oem_netbios_computer.a = global_myname(); - ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &r, + ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), &r, (ndr_push_flags_fn_t)ndr_push_NL_AUTH_MESSAGE); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { DEBUG(0,("Failed to marshall NL_AUTH_MESSAGE.\n")); diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c index 8320d14fe6..864e80d0f9 100644 --- a/source3/rpc_client/init_spoolss.c +++ b/source3/rpc_client/init_spoolss.c @@ -65,7 +65,7 @@ WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx, enum winreg_Type type) { enum ndr_err_code ndr_err; - ndr_err = ndr_pull_union_blob(blob, mem_ctx, NULL, data, type, + ndr_err = ndr_pull_union_blob(blob, mem_ctx, data, type, (ndr_pull_flags_fn_t)ndr_pull_spoolss_PrinterData); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return WERR_GENERAL_FAILURE; @@ -81,7 +81,7 @@ WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, union spoolss_PrinterData *data) { enum ndr_err_code ndr_err; - ndr_err = ndr_push_union_blob(blob, mem_ctx, NULL, data, type, + ndr_err = ndr_push_union_blob(blob, mem_ctx, data, type, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterData); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return WERR_GENERAL_FAILURE; diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c index 5675878b4b..bbd78067bf 100644 --- a/source3/rpc_client/ndr.c +++ b/source3/rpc_client/ndr.c @@ -64,7 +64,7 @@ struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx, state->call->name, NDR_IN, r); } - push = ndr_push_init_ctx(talloc_tos(), NULL); + push = ndr_push_init_ctx(talloc_tos()); if (tevent_req_nomem(push, req)) { return tevent_req_post(req, ev); } @@ -131,7 +131,7 @@ NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx) return NT_STATUS_NO_MEMORY; } - pull = ndr_pull_init_blob(&blob, mem_ctx, NULL); + pull = ndr_pull_init_blob(&blob, mem_ctx); if (pull == NULL) { return NT_STATUS_NO_MEMORY; } |