From 50721b485f4322a2cd8688740bc1de3f754a7c05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Thu, 8 Jan 2009 13:23:59 +0100 Subject: [PATCH] s3-svcctl: use pidl based struct SERVICE_STATUS. Guenther --- source3/include/rpc_svcctl.h | 8 +------- source3/include/services.h | 4 ++-- source3/rpc_parse/parse_svcctl.c | 4 ++-- source3/services/svc_netlogon.c | 4 ++-- source3/services/svc_rcinit.c | 4 ++-- source3/services/svc_spoolss.c | 4 ++-- source3/services/svc_winreg.c | 4 ++-- source3/services/svc_wins.c | 4 ++-- source3/utils/net_rpc_service.c | 6 +++--- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h index 2b30bfbfb148..b12cecb56cd2 100644 --- a/source3/include/rpc_svcctl.h +++ b/source3/include/rpc_svcctl.h @@ -47,16 +47,10 @@ /* utility structures for RPCs */ -/* - * "struct SERVICE_STATUS" comes from librpc/gen_ndr/svcctl.h - */ - -typedef struct SERVICE_STATUS SERVICE_STATUS; - typedef struct { UNISTR servicename; UNISTR displayname; - SERVICE_STATUS status; + struct SERVICE_STATUS status; } ENUM_SERVICES_STATUS; /* rpc structures */ diff --git a/source3/include/services.h b/source3/include/services.h index fd14be1daddb..f746f0c8dfe0 100644 --- a/source3/include/services.h +++ b/source3/include/services.h @@ -30,9 +30,9 @@ typedef struct { /* functions for enumerating subkeys and values */ - WERROR (*stop_service)( const char *service, SERVICE_STATUS *status ); + WERROR (*stop_service)( const char *service, struct SERVICE_STATUS *status ); WERROR (*start_service) ( const char *service ); - WERROR (*service_status)( const char *service, SERVICE_STATUS *status ); + WERROR (*service_status)( const char *service, struct SERVICE_STATUS *status ); } SERVICE_CONTROL_OPS; /* structure to store the service handle information */ diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c index 559c65432e61..022ece60c983 100644 --- a/source3/rpc_parse/parse_svcctl.c +++ b/source3/rpc_parse/parse_svcctl.c @@ -25,7 +25,7 @@ /******************************************************************* ********************************************************************/ -static bool svcctl_io_service_status( const char *desc, SERVICE_STATUS *status, prs_struct *ps, int depth ) +static bool svcctl_io_service_status( const char *desc, struct SERVICE_STATUS *status, prs_struct *ps, int depth ) { prs_debug(ps, depth, desc, "svcctl_io_service_status"); @@ -85,7 +85,7 @@ uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status ) size += size_of_relative_string( &status->servicename ); size += size_of_relative_string( &status->displayname ); - size += sizeof(SERVICE_STATUS); + size += sizeof(struct SERVICE_STATUS); return size; } diff --git a/source3/services/svc_netlogon.c b/source3/services/svc_netlogon.c index c5a5385cdd0a..2745695a1604 100644 --- a/source3/services/svc_netlogon.c +++ b/source3/services/svc_netlogon.c @@ -24,7 +24,7 @@ /********************************************************************* *********************************************************************/ -static WERROR netlogon_status( const char *service, SERVICE_STATUS *service_status ) +static WERROR netlogon_status( const char *service, struct SERVICE_STATUS *service_status ) { ZERO_STRUCTP( service_status ); @@ -44,7 +44,7 @@ static WERROR netlogon_status( const char *service, SERVICE_STATUS *service_stat /********************************************************************* *********************************************************************/ -static WERROR netlogon_stop( const char *service, SERVICE_STATUS *service_status ) +static WERROR netlogon_stop( const char *service, struct SERVICE_STATUS *service_status ) { netlogon_status( service, service_status ); diff --git a/source3/services/svc_rcinit.c b/source3/services/svc_rcinit.c index 3d9e6673a05b..5e9a5466fea5 100644 --- a/source3/services/svc_rcinit.c +++ b/source3/services/svc_rcinit.c @@ -22,7 +22,7 @@ /********************************************************************* *********************************************************************/ -static WERROR rcinit_stop( const char *service, SERVICE_STATUS *status ) +static WERROR rcinit_stop( const char *service, struct SERVICE_STATUS *status ) { char *command = NULL; int ret, fd; @@ -81,7 +81,7 @@ static WERROR rcinit_start( const char *service ) /********************************************************************* *********************************************************************/ -static WERROR rcinit_status( const char *service, SERVICE_STATUS *status ) +static WERROR rcinit_status( const char *service, struct SERVICE_STATUS *status ) { char *command = NULL; int ret, fd; diff --git a/source3/services/svc_spoolss.c b/source3/services/svc_spoolss.c index 9d4113cadf40..3bf659271d59 100644 --- a/source3/services/svc_spoolss.c +++ b/source3/services/svc_spoolss.c @@ -24,7 +24,7 @@ /********************************************************************* *********************************************************************/ -static WERROR spoolss_stop( const char *service, SERVICE_STATUS *service_status ) +static WERROR spoolss_stop( const char *service, struct SERVICE_STATUS *service_status ) { ZERO_STRUCTP( service_status ); @@ -57,7 +57,7 @@ static WERROR spoolss_start( const char *service ) /********************************************************************* *********************************************************************/ -static WERROR spoolss_status( const char *service, SERVICE_STATUS *service_status ) +static WERROR spoolss_status( const char *service, struct SERVICE_STATUS *service_status ) { ZERO_STRUCTP( service_status ); diff --git a/source3/services/svc_winreg.c b/source3/services/svc_winreg.c index 09d25f45e4d4..4976e6d3b344 100644 --- a/source3/services/svc_winreg.c +++ b/source3/services/svc_winreg.c @@ -24,7 +24,7 @@ /********************************************************************* *********************************************************************/ -static WERROR winreg_stop( const char *service, SERVICE_STATUS *service_status ) +static WERROR winreg_stop( const char *service, struct SERVICE_STATUS *service_status ) { return WERR_ACCESS_DENIED; } @@ -40,7 +40,7 @@ static WERROR winreg_start( const char *service ) /********************************************************************* *********************************************************************/ -static WERROR winreg_status( const char *service, SERVICE_STATUS *service_status ) +static WERROR winreg_status( const char *service, struct SERVICE_STATUS *service_status ) { ZERO_STRUCTP( service_status ); diff --git a/source3/services/svc_wins.c b/source3/services/svc_wins.c index c9ef5e5b511c..d0b50524924f 100644 --- a/source3/services/svc_wins.c +++ b/source3/services/svc_wins.c @@ -24,7 +24,7 @@ /********************************************************************* *********************************************************************/ -static WERROR wins_status( const char *service, SERVICE_STATUS *service_status ) +static WERROR wins_status( const char *service, struct SERVICE_STATUS *service_status ) { ZERO_STRUCTP( service_status ); @@ -44,7 +44,7 @@ static WERROR wins_status( const char *service, SERVICE_STATUS *service_status ) /********************************************************************* *********************************************************************/ -static WERROR wins_stop( const char *service, SERVICE_STATUS *service_status ) +static WERROR wins_stop( const char *service, struct SERVICE_STATUS *service_status ) { wins_status( service, service_status ); diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c index 2c32537e8029..3186b8c77941 100644 --- a/source3/utils/net_rpc_service.c +++ b/source3/utils/net_rpc_service.c @@ -66,7 +66,7 @@ static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd, uint32 *state ) { POLICY_HND hService; - SERVICE_STATUS service_status; + struct SERVICE_STATUS service_status; WERROR result = WERR_GENERAL_FAILURE; NTSTATUS status; @@ -145,7 +145,7 @@ static WERROR control_service(struct rpc_pipe_client *pipe_hnd, POLICY_HND hService; WERROR result = WERR_GENERAL_FAILURE; NTSTATUS status; - SERVICE_STATUS service_status; + struct SERVICE_STATUS service_status; uint32 state = 0; /* Open the Service */ @@ -263,7 +263,7 @@ static NTSTATUS rpc_service_status_internal(struct net_context *c, POLICY_HND hSCM, hService; WERROR result = WERR_GENERAL_FAILURE; NTSTATUS status; - SERVICE_STATUS service_status; + struct SERVICE_STATUS service_status; struct QUERY_SERVICE_CONFIG config; uint32_t buf_size = sizeof(config); uint32_t ret_size = 0; -- 2.34.1