Remove unused marshalling for SRV_NET_SHARE_DEL.

Guenther

diff --git a/source/include/rpc_srvsvc.h b/source/include/rpc_srvsvc.h
index d0b25e4fad69f31a69e4a578dc7996bbc8fda681..dd67c48529ba6c8bdae0e29b1c95717b7c5af132 100644 (file)
--- a/source/include/rpc_srvsvc.h
+++ b/source/include/rpc_srvsvc.h
@@ -625,23 +625,6 @@ typedef struct r_net_share_add
 
 } SRV_R_NET_SHARE_ADD;
 
-/* SRV_Q_NET_SHARE_DEL */
-typedef struct q_net_share_del
-{
-       uint32 ptr_srv_name;
-       UNISTR2 uni_srv_name;
-       UNISTR2 uni_share_name;
-       uint32 reserved;
-
-} SRV_Q_NET_SHARE_DEL;
-
-/* SRV_R_NET_SHARE_DEL */
-typedef struct r_net_share_del
-{
-       WERROR status;               /* return status */
-
-} SRV_R_NET_SHARE_DEL;
-
 /***************************/
 
 typedef struct {

diff --git a/source/rpc_client/cli_srvsvc.c b/source/rpc_client/cli_srvsvc.c
index 524678c12207171a9f5505c728bcc488d3154962..c0431200306bea4e87ddebad2f2cff6988272b06 100644 (file)
--- a/source/rpc_client/cli_srvsvc.c
+++ b/source/rpc_client/cli_srvsvc.c
@@ -362,38 +362,6 @@ WERROR rpccli_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
        return result;
 }
 
-WERROR rpccli_srvsvc_net_share_del(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                               const char *sharename)
-{
-       prs_struct qbuf, rbuf;
-       SRV_Q_NET_SHARE_DEL q;
-       SRV_R_NET_SHARE_DEL r;
-       WERROR result = W_ERROR(ERRgeneral);
-       fstring server;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise input parameters */
-
-       slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->cli->desthost);
-       strupper_m(server);
-
-       init_srv_q_net_share_del(&q, server, sharename);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR(cli, mem_ctx, PI_SRVSVC, SRV_NET_SHARE_DEL,
-               q, r,
-               qbuf, rbuf,
-               srv_io_q_net_share_del,
-               srv_io_r_net_share_del,
-               WERR_GENERAL_FAILURE);
-
-       result = r.status;
-       return result;
-}
-
 WERROR rpccli_srvsvc_net_share_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                                const char *netname, uint32 type, 
                                const char *remark, uint32 perms, 

diff --git a/source/rpc_parse/parse_srv.c b/source/rpc_parse/parse_srv.c
index a09e704bed698718a9c4a4dc7d6a0ade9ba2b104..44777db8af5c9a0b7f330c8d62035e3d6ddaf699 100644 (file)
--- a/source/rpc_parse/parse_srv.c
+++ b/source/rpc_parse/parse_srv.c
@@ -1521,70 +1521,6 @@ bool srv_io_r_net_share_add(const char *desc, SRV_R_NET_SHARE_ADD *r_n, prs_stru
        return True;
 }      
 
-/*******************************************************************
- initialises a structure.
-********************************************************************/
-
-void init_srv_q_net_share_del(SRV_Q_NET_SHARE_DEL *del, const char *srvname,
-                             const char *sharename)
-{
-       del->ptr_srv_name = 1;
-       init_unistr2(&del->uni_srv_name, srvname, UNI_STR_TERMINATE);
-       init_unistr2(&del->uni_share_name, sharename, UNI_STR_TERMINATE);
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_q_net_share_del(const char *desc, SRV_Q_NET_SHARE_DEL *q_n, prs_struct *ps, int depth)
-{
-       if (q_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_q_net_share_del");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_srv_name", ps, depth, &q_n->ptr_srv_name))
-               return False;
-       if(!smb_io_unistr2("", &q_n->uni_srv_name, True, ps, depth))
-               return False;
-
-       if(!smb_io_unistr2("", &q_n->uni_share_name, True, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("reserved", ps, depth, &q_n->reserved))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Reads or writes a structure.
-********************************************************************/
-
-bool srv_io_r_net_share_del(const char *desc, SRV_R_NET_SHARE_DEL *q_n, prs_struct *ps, int depth)
-{
-       if (q_n == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "srv_io_r_net_share_del");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_werror("status", ps, depth, &q_n->status))
-               return False;
-
-       return True;
-}      
-
 /*******************************************************************
  Inits a SESS_INFO_0_STR structure
 ********************************************************************/