From 1a65f16843d4127573da522078200b272ee67d30 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 20 Mar 2008 01:38:23 +0100 Subject: Use pidl for _svcctl_EnumDependentServicesW(). Guenther (This used to be commit 988291a9c07c055213f8979ebe75bb392811008d) --- source3/rpc_server/srv_svcctl.c | 18 +----------------- source3/rpc_server/srv_svcctl_nt.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 29 deletions(-) (limited to 'source3') diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c index 5e125145d6..e3ff2cc8a0 100644 --- a/source3/rpc_server/srv_svcctl.c +++ b/source3/rpc_server/srv_svcctl.c @@ -131,23 +131,7 @@ static bool api_svcctl_query_service_status_ex(pipes_struct *p) static bool api_svcctl_enum_dependent_services(pipes_struct *p) { - SVCCTL_Q_ENUM_DEPENDENT_SERVICES q_u; - SVCCTL_R_ENUM_DEPENDENT_SERVICES r_u; - prs_struct *data = &p->in_data.data; - prs_struct *rdata = &p->out_data.rdata; - - ZERO_STRUCT(q_u); - ZERO_STRUCT(r_u); - - if(!svcctl_io_q_enum_dependent_services("", &q_u, data, 0)) - return False; - - r_u.status = _svcctl_enum_dependent_services(p, &q_u, &r_u); - - if(!svcctl_io_r_enum_dependent_services("", &r_u, rdata, 0)) - return False; - - return True; + return proxy_svcctl_call(p, NDR_SVCCTL_ENUMDEPENDENTSERVICESW); } /******************************************************************* diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 3962626e27..c117d46fde 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -527,11 +527,13 @@ WERROR _svcctl_ControlService(pipes_struct *p, } /******************************************************************** + _svcctl_EnumDependentServicesW ********************************************************************/ -WERROR _svcctl_enum_dependent_services( pipes_struct *p, SVCCTL_Q_ENUM_DEPENDENT_SERVICES *q_u, SVCCTL_R_ENUM_DEPENDENT_SERVICES *r_u ) +WERROR _svcctl_EnumDependentServicesW(pipes_struct *p, + struct svcctl_EnumDependentServicesW *r) { - SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle ); + SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.service ); /* perform access checks */ @@ -543,13 +545,12 @@ WERROR _svcctl_enum_dependent_services( pipes_struct *p, SVCCTL_Q_ENUM_DEPENDENT /* we have to set the outgoing buffer size to the same as the incoming buffer size (even in the case of failure */ + /* this is done in the autogenerated server already - gd */ - rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx ); - - r_u->needed = q_u->buffer_size; + *r->out.bytes_needed = r->in.buf_size; /* no dependent services...basically a stub function */ - r_u->returned = 0; + *r->out.services_returned = 0; return WERR_OK; } @@ -948,12 +949,6 @@ WERROR _svcctl_CreateServiceW(pipes_struct *p, struct svcctl_CreateServiceW *r) return WERR_NOT_SUPPORTED; } -WERROR _svcctl_EnumDependentServicesW(pipes_struct *p, struct svcctl_EnumDependentServicesW *r) -{ - p->rng_fault_state = True; - return WERR_NOT_SUPPORTED; -} - WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, struct svcctl_EnumServicesStatusW *r) { p->rng_fault_state = True; -- cgit