From 3acd6bde58ecd68faf8200268cc674a71c57778d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 6 Apr 2011 14:35:24 +0200 Subject: s3-netapi: use libnetapi_get_binding_handle(). Guenther --- source3/lib/netapi/share.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) (limited to 'source3/lib/netapi/share.c') diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c index f2cd92ef08..c4ed1549ce 100644 --- a/source3/lib/netapi/share.c +++ b/source3/lib/netapi/share.c @@ -182,7 +182,6 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx, { WERROR werr; NTSTATUS status; - struct rpc_pipe_client *pipe_cli = NULL; union srvsvc_NetShareInfo info; struct dcerpc_binding_handle *b; @@ -200,15 +199,13 @@ WERROR NetShareAdd_r(struct libnetapi_ctx *ctx, return WERR_UNKNOWN_LEVEL; } - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_srvsvc.syntax_id, - &pipe_cli); + werr = libnetapi_get_binding_handle(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &b); if (!W_ERROR_IS_OK(werr)) { goto done; } - b = pipe_cli->binding_handle; - status = map_SHARE_INFO_buffer_to_srvsvc_share_info(ctx, r->in.buffer, r->in.level, @@ -254,22 +251,19 @@ WERROR NetShareDel_r(struct libnetapi_ctx *ctx, { WERROR werr; NTSTATUS status; - struct rpc_pipe_client *pipe_cli = NULL; struct dcerpc_binding_handle *b; if (!r->in.net_name) { return WERR_INVALID_PARAM; } - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_srvsvc.syntax_id, - &pipe_cli); + werr = libnetapi_get_binding_handle(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &b); if (!W_ERROR_IS_OK(werr)) { goto done; } - b = pipe_cli->binding_handle; - status = dcerpc_srvsvc_NetShareDel(b, talloc_tos(), r->in.server_name, r->in.net_name, @@ -301,7 +295,6 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, { WERROR werr; NTSTATUS status; - struct rpc_pipe_client *pipe_cli = NULL; struct srvsvc_NetShareInfoCtr info_ctr; struct srvsvc_NetShareCtr0 ctr0; struct srvsvc_NetShareCtr1 ctr1; @@ -327,15 +320,13 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx, ZERO_STRUCT(info_ctr); - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_srvsvc.syntax_id, - &pipe_cli); + werr = libnetapi_get_binding_handle(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &b); if (!W_ERROR_IS_OK(werr)) { goto done; } - b = pipe_cli->binding_handle; - info_ctr.level = r->in.level; switch (r->in.level) { case 0: @@ -414,7 +405,6 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx, { WERROR werr; NTSTATUS status; - struct rpc_pipe_client *pipe_cli = NULL; union srvsvc_NetShareInfo info; uint32_t num_entries = 0; struct dcerpc_binding_handle *b; @@ -437,15 +427,13 @@ WERROR NetShareGetInfo_r(struct libnetapi_ctx *ctx, return WERR_UNKNOWN_LEVEL; } - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_srvsvc.syntax_id, - &pipe_cli); + werr = libnetapi_get_binding_handle(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &b); if (!W_ERROR_IS_OK(werr)) { goto done; } - b = pipe_cli->binding_handle; - status = dcerpc_srvsvc_NetShareGetInfo(b, talloc_tos(), r->in.server_name, r->in.net_name, @@ -491,7 +479,6 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx, { WERROR werr; NTSTATUS status; - struct rpc_pipe_client *pipe_cli = NULL; union srvsvc_NetShareInfo info; struct dcerpc_binding_handle *b; @@ -514,15 +501,13 @@ WERROR NetShareSetInfo_r(struct libnetapi_ctx *ctx, return WERR_UNKNOWN_LEVEL; } - werr = libnetapi_open_pipe(ctx, r->in.server_name, - &ndr_table_srvsvc.syntax_id, - &pipe_cli); + werr = libnetapi_get_binding_handle(ctx, r->in.server_name, + &ndr_table_srvsvc.syntax_id, + &b); if (!W_ERROR_IS_OK(werr)) { goto done; } - b = pipe_cli->binding_handle; - status = map_SHARE_INFO_buffer_to_srvsvc_share_info(ctx, r->in.buffer, r->in.level, -- cgit