Remove unused marshalling for SVCCTL_OPEN_SCMANAGER.

Guenther
(This used to be commit 1162b8a02d365b79f5a3e86c936bae80092f1869)

diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 1e42aef20c60d0568413b9c53bca3685c683dfaa..17e25903ef497b35036dab7a7076b6ffd8013fa4 100644 (file)
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -196,19 +196,6 @@ typedef struct _ServiceInfo {
 
 /**************************/
 
-typedef struct {
-       UNISTR2 *servername;
-       UNISTR2 *database; 
-       uint32 access;
-} SVCCTL_Q_OPEN_SCMANAGER;
-
-typedef struct {
-       POLICY_HND handle;
-       WERROR status;
-} SVCCTL_R_OPEN_SCMANAGER;
-
-/**************************/
-
 typedef struct {
        POLICY_HND handle;
        UNISTR2 servicename;

diff --git a/source3/rpc_client/cli_svcctl.c b/source3/rpc_client/cli_svcctl.c
index 95673c15654f53bbc491ac0e0b39f47890aa698e..699db6cd77b8bf8ce8724b1539e6f04fc4a0b634 100644 (file)
--- a/source3/rpc_client/cli_svcctl.c
+++ b/source3/rpc_client/cli_svcctl.c
@@ -60,48 +60,6 @@ const char* svc_status_string( uint32 state )
 /********************************************************************
 ********************************************************************/
 
-WERROR rpccli_svcctl_open_scm(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
-                              POLICY_HND *hSCM, uint32 access_desired )
-{
-       SVCCTL_Q_OPEN_SCMANAGER in;
-       SVCCTL_R_OPEN_SCMANAGER out;
-       prs_struct qbuf, rbuf;
-       fstring server;
-       
-       ZERO_STRUCT(in);
-       ZERO_STRUCT(out);
-       
-       /* leave the database name NULL to get the default service db */
-
-       in.database = NULL;
-
-       /* set the server name */
-
-       if ( !(in.servername = TALLOC_P( mem_ctx, UNISTR2 )) )
-               return WERR_NOMEM;
-       fstr_sprintf( server, "\\\\%s", cli->cli->desthost );
-       init_unistr2( in.servername, server, UNI_STR_TERMINATE );
-
-       in.access = access_desired;
-       
-       CLI_DO_RPC_WERR( cli, mem_ctx, PI_SVCCTL, SVCCTL_OPEN_SCMANAGER_W, 
-                   in, out, 
-                   qbuf, rbuf,
-                   svcctl_io_q_open_scmanager,
-                   svcctl_io_r_open_scmanager, 
-                   WERR_GENERAL_FAILURE );
-       
-       if ( !W_ERROR_IS_OK( out.status ) )
-               return out.status;
-
-       memcpy( hSCM, &out.handle, sizeof(POLICY_HND) );
-       
-       return out.status;
-}
-
-/********************************************************************
-********************************************************************/
-
 WERROR rpccli_svcctl_open_service( struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                                 POLICY_HND *hSCM, POLICY_HND *hService, 
                                const char *servicename, uint32 access_desired )

diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index 18e12ef0a6c48fbb0de905f469627eb4089fd0b2..488f060e6e5fe662ec80fb6c357393000423fcf7 100644 (file)
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -198,59 +198,6 @@ uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config )
 /*******************************************************************
 ********************************************************************/
 
-bool svcctl_io_q_open_scmanager(const char *desc, SVCCTL_Q_OPEN_SCMANAGER *q_u, prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_q_open_scmanager");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_pointer("servername", ps, depth, (void*)&q_u->servername, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
-               return False;
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_pointer("database", ps, depth, (void*)&q_u->database, sizeof(UNISTR2), (PRS_POINTER_CAST)prs_io_unistr2))
-               return False;
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("access", ps, depth, &q_u->access))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_r_open_scmanager(const char *desc, SVCCTL_R_OPEN_SCMANAGER *r_u, prs_struct *ps, int depth)
-{
-       if (r_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "svcctl_io_r_open_scmanager");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("scm_pol", &r_u->handle, ps, depth))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
 bool svcctl_io_q_get_display_name(const char *desc, SVCCTL_Q_GET_DISPLAY_NAME *q_u, prs_struct *ps, int depth)
 {
        if (q_u == NULL)