Remove unused marshalling for SVCCTL_QUERY_STATUS.

Guenther
(This used to be commit 8a621f517fe38ce91f10e12fccc2963af6afc33d)

diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index aaa02dd28c7f6e1defda8681931450cf427a8a0d..2bd28db291141006b0b36ae6f7691bb4e98a93d2 100644 (file)
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -196,17 +196,6 @@ typedef struct _ServiceInfo {
 
 /**************************/
 
-typedef struct {
-       POLICY_HND handle;
-} SVCCTL_Q_QUERY_STATUS;
-
-typedef struct {
-       SERVICE_STATUS svc_status;
-       WERROR status;
-} SVCCTL_R_QUERY_STATUS;
-
-/**************************/
-
 typedef struct {
        POLICY_HND handle;
        uint32 type;

diff --git a/source3/rpc_client/cli_svcctl.c b/source3/rpc_client/cli_svcctl.c
index c4ff44734a0c3cb0a58e4ab98c89ab951e6bc6e0..b21909fd034dae5fcd4da0ea85d20e0f3b0ab019 100644 (file)
--- a/source3/rpc_client/cli_svcctl.c
+++ b/source3/rpc_client/cli_svcctl.c
@@ -129,36 +129,6 @@ WERROR rpccli_svcctl_enumerate_services( struct rpc_pipe_client *cli, TALLOC_CTX
 /*******************************************************************
 *******************************************************************/
 
-WERROR rpccli_svcctl_query_status( struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                POLICY_HND *hService, SERVICE_STATUS *status )
-{
-       SVCCTL_Q_QUERY_STATUS in;
-       SVCCTL_R_QUERY_STATUS out;
-       prs_struct qbuf, rbuf;
-       
-       ZERO_STRUCT(in);
-       ZERO_STRUCT(out);
-       
-       memcpy( &in.handle, hService, sizeof(POLICY_HND) );
-       
-       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SVCCTL, SVCCTL_QUERY_STATUS, 
-                   in, out, 
-                   qbuf, rbuf,
-                   svcctl_io_q_query_status,
-                   svcctl_io_r_query_status, 
-                   WERR_GENERAL_FAILURE );
-       
-       if ( !W_ERROR_IS_OK( out.status ) )
-               return out.status;
-
-       memcpy( status, &out.svc_status, sizeof(SERVICE_STATUS) );
-       
-       return out.status;
-}
-
-/*******************************************************************
-*******************************************************************/
-
 WERROR rpccli_svcctl_query_config(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                 POLICY_HND *hService, SERVICE_CONFIG *config )
 {

diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index 0f39de07467210f95bcbf0ba5b487eaa62278dec..ef9f03705de993d354b75b10eebf667ee6029764 100644 (file)
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -198,49 +198,6 @@ uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config )
 /*******************************************************************
 ********************************************************************/
 
-bool svcctl_io_q_query_status(const char *desc, SVCCTL_Q_QUERY_STATUS *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_q_query_status");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("service_pol", &q_u->handle, ps, depth))
-               return False;
-       
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_r_query_status(const char *desc, SVCCTL_R_QUERY_STATUS *r_u, prs_struct *ps, int depth)
-{
-       if (r_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_r_query_status");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!svcctl_io_service_status("service_status", &r_u->svc_status, ps, depth))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
 bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL)