s3: remove old marshalling for SVCCTL_QUERY_SERVICE_CONFIG.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e2a343f16440157896914f65edee08763af22736..dd9f022e46662f00b2c1383ad070a0e980948263 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8164,11 +8164,8 @@ bool convert_port_data_1( NT_PORT_DATA_1 *port1, RPC_BUFFER *buf ) ;
 bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth );
 bool svcctl_io_service_status_process( const char *desc, SERVICE_STATUS_PROCESS *status, RPC_BUFFER *buffer, int depth );
 uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status );
-uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config );
 bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth);
 bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_STATUS *r_u, prs_struct *ps, int depth);
-bool svcctl_io_q_query_service_config(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, prs_struct *ps, int depth);
-bool svcctl_io_r_query_service_config(const char *desc, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u, prs_struct *ps, int depth);
 bool svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, prs_struct *ps, int depth);
 void init_service_description_buffer(SERVICE_DESCRIPTION *desc, const char *service_desc );
 bool svcctl_io_service_description( const char *desc, SERVICE_DESCRIPTION *description, RPC_BUFFER *buffer, int depth );

diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index aa1d1662c839edfa59aa698095c7bf041f8daa8b..0e31a53e32456788d8e66e9d699736d08d540ba9 100644 (file)
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -141,18 +141,6 @@ typedef struct {
        SERVICE_STATUS status;
 } ENUM_SERVICES_STATUS;
 
-typedef struct {
-       uint32 service_type;
-       uint32 start_type;
-       uint32 error_control;
-       UNISTR2 *executablepath;
-       UNISTR2 *loadordergroup;
-       uint32 tag_id;
-       UNISTR2 *dependencies;
-       UNISTR2 *startname;
-       UNISTR2 *displayname;
-} SERVICE_CONFIG;
-
 typedef struct {
        uint32 unknown; 
         UNISTR description;
@@ -212,20 +200,6 @@ typedef struct {
        WERROR status;
 } SVCCTL_R_ENUM_SERVICES_STATUS;
 
-/**************************/
-
-typedef struct {
-       POLICY_HND handle;
-       uint32 buffer_size;
-} SVCCTL_Q_QUERY_SERVICE_CONFIG;
-
-typedef struct {
-       SERVICE_CONFIG config;
-       uint32 needed;
-       WERROR status;
-} SVCCTL_R_QUERY_SERVICE_CONFIG;
-
-
 /**************************/
 
 typedef struct {

diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index c5d93864ba6f142a1c515b0dd2364f89a9af788e..7d31f4b2f01b936addd42e83d5642c62f8026ac3 100644 (file)
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -58,51 +58,6 @@ static bool svcctl_io_service_status( const char *desc, SERVICE_STATUS *status,
 /*******************************************************************
 ********************************************************************/
 
-static bool svcctl_io_service_config( const char *desc, SERVICE_CONFIG *config, prs_struct *ps, int depth )
-{
-
-       prs_debug(ps, depth, desc, "svcctl_io_service_config");
-       depth++;
-
-       if(!prs_uint32("service_type", ps, depth, &config->service_type))
-               return False;
-       if(!prs_uint32("start_type", ps, depth, &config->start_type))
-               return False;
-       if(!prs_uint32("error_control", ps, depth, &config->error_control))
-               return False;
-
-       if (!prs_io_unistr2_p("", ps, depth, &config->executablepath))
-               return False;
-       if (!prs_io_unistr2_p("", ps, depth, &config->loadordergroup))
-               return False;
-
-       if(!prs_uint32("tag_id", ps, depth, &config->tag_id))
-               return False;
-
-       if (!prs_io_unistr2_p("", ps, depth, &config->dependencies))
-               return False;
-       if (!prs_io_unistr2_p("", ps, depth, &config->startname))
-               return False;
-       if (!prs_io_unistr2_p("", ps, depth, &config->displayname))
-               return False;
-
-       if (!prs_io_unistr2("", ps, depth, config->executablepath))
-               return False;
-       if (!prs_io_unistr2("", ps, depth, config->loadordergroup))
-               return False;
-       if (!prs_io_unistr2("", ps, depth, config->dependencies))
-               return False;
-       if (!prs_io_unistr2("", ps, depth, config->startname))
-               return False;
-       if (!prs_io_unistr2("", ps, depth, config->displayname))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
 bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth )
 {
        prs_struct *ps=&buffer->prs;
@@ -175,26 +130,6 @@ static uint32 sizeof_unistr2( UNISTR2 *string )
        return size;
 }
 
-/********************************************************************
-********************************************************************/
-
-uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config )
-{
-       uint32 size = 0;
-
-       size = sizeof(uint32) * 4;      /* static uint32 fields */
-
-       /* now add the UNISTR2 + pointer sizes */
-
-       size += sizeof(uint32) * sizeof_unistr2(config->executablepath);
-       size += sizeof(uint32) * sizeof_unistr2(config->loadordergroup);
-       size += sizeof(uint32) * sizeof_unistr2(config->dependencies);
-       size += sizeof(uint32) * sizeof_unistr2(config->startname);
-       size += sizeof(uint32) * sizeof_unistr2(config->displayname);
-       
-       return size;
-}
-
 /*******************************************************************
 ********************************************************************/
 
@@ -262,57 +197,6 @@ bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_S
 /*******************************************************************
 ********************************************************************/
 
-bool svcctl_io_q_query_service_config(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_q_query_service_config");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("service_pol", &q_u->handle, ps, depth))
-               return False;
-
-       if(!prs_uint32("buffer_size", ps, depth, &q_u->buffer_size))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_r_query_service_config(const char *desc, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u, prs_struct *ps, int depth)
-{
-       if (r_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_r_query_service_config");
-       depth++;
-
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!svcctl_io_service_config("config", &r_u->config, ps, depth))
-               return False;
-
-       if(!prs_uint32("needed", ps, depth, &r_u->needed))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
 bool svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL)