s3-svcctl: use pidl based struct SERVICE_STATUS.

Guenther

diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 2b30bfbfb148ecd881a50b5190faed50c2772d85..b12cecb56cd2dacb0920883c1e127a382e9eb4e7 100644 (file)
--- 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 fd14be1daddb1602e59d444d2843f73f30d1460d..f746f0c8dfe0c894d854da10c8ffc6a3bd6d5515 100644 (file)
--- 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 559c65432e61e4086a45393fa60efded51807a2f..022ece60c98349cef68d892a5f8ccb5e06fdd4e0 100644 (file)
--- 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 c5a5385cdd0aff1982f6c6b1bc906b48d9a98d2f..2745695a1604bf01762e8fc5fce34106ecf1ddd9 100644 (file)
--- 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 3d9e6673a05be9b73011705289faaa072b2a37a9..5e9a5466fea56e8acaa982a3682ae209a7b5d5c7 100644 (file)
--- 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 9d4113cadf40b2467cff03cbe021ae344f99668e..3bf659271d59e313bce475bd3a2729179099d65e 100644 (file)
--- 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 09d25f45e4d4c442716fd7fcfe4a38faeb4fd36b..4976e6d3b34410f6beaa166e794b995cd2bac92f 100644 (file)
--- 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 c9ef5e5b511cc5df91be8d49812d1b62c573891f..d0b50524924f450439027c14c282be6483460799 100644 (file)
--- 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 2c32537e8029892cc32832f5065e83dfdc9a4598..3186b8c77941001da84a72b48d7e92c425bd1093 100644 (file)
--- 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;