Remove unused marshalling for SAMR_QUERY_GROUPMEM.

Guenther
(This used to be commit 48e74f77529ca8d75d99b1f415b9417ff0cf0679)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index affd1f2a1007623743d082b950c4c39d3df2bc85..f499f673e95fc9b14daf26a6b3a14e2bcac8ccb8 100644 (file)
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1335,34 +1335,6 @@ typedef struct r_samr_lookup_rids_info
 } SAMR_R_LOOKUP_RIDS;
 
 
-/* SAMR_Q_QUERY_GROUPMEM - query group members */
-typedef struct q_samr_query_groupmem_info
-{
-       POLICY_HND group_pol;        /* policy handle */
-
-} SAMR_Q_QUERY_GROUPMEM;
-
-
-/* SAMR_R_QUERY_GROUPMEM - query group members */
-typedef struct r_samr_query_groupmem_info
-{
-       uint32 ptr;
-       uint32 num_entries;
-
-       uint32 ptr_rids;
-       uint32 ptr_attrs;
-
-       uint32 num_rids;
-       uint32 *rid;
-
-       uint32 num_attrs;
-       uint32 *attr;
-
-       NTSTATUS status;
-
-} SAMR_R_QUERY_GROUPMEM;
-
-
 /* SAMR_ENC_PASSWD */
 typedef struct enc_passwd_info
 {

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index b0078c3433c439b8a4801c0c8ef1273d4a043ee1..5b477aaf20b20b7b7c57ca5be84e2428570aae88 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -252,45 +252,6 @@ NTSTATUS rpccli_samr_query_useraliases(struct rpc_pipe_client *cli,
        return result;
 }
 
-/* Query user groups */
-
-NTSTATUS rpccli_samr_query_groupmem(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx,
-                                   POLICY_HND *group_pol, uint32 *num_mem, 
-                                   uint32 **rid, uint32 **attr)
-{
-       prs_struct qbuf, rbuf;
-       SAMR_Q_QUERY_GROUPMEM q;
-       SAMR_R_QUERY_GROUPMEM r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       DEBUG(10,("cli_samr_query_groupmem\n"));
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-
-       init_samr_q_query_groupmem(&q, group_pol);
-
-       CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_GROUPMEM,
-               q, r,
-               qbuf, rbuf,
-               samr_io_q_query_groupmem,
-               samr_io_r_query_groupmem,
-               NT_STATUS_UNSUCCESSFUL); 
-
-       /* Return output parameters */
-
-       if (NT_STATUS_IS_OK(result = r.status)) {
-               *num_mem = r.num_entries;
-               *rid = r.rid;
-               *attr = r.attr;
-       }
-
-       return result;
-}
-
 /**
  * Enumerate domain users
  *

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index c75d77a502c898ebb3b75085ef05e9790290aada..821fee7d4ce33e0016c5695dc04340541c3be946 100644 (file)
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -2174,139 +2174,6 @@ bool samr_io_r_query_groupinfo(const char *desc, SAMR_R_QUERY_GROUPINFO * r_u,
        return True;
 }
 
-/*******************************************************************
-inits a SAMR_Q_QUERY_GROUPMEM structure.
-********************************************************************/
-
-void init_samr_q_query_groupmem(SAMR_Q_QUERY_GROUPMEM * q_c, POLICY_HND *hnd)
-{
-       DEBUG(5, ("init_samr_q_query_groupmem\n"));
-
-       q_c->group_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_query_groupmem(const char *desc, SAMR_Q_QUERY_GROUPMEM * q_u,
-                             prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "samr_io_q_query_groupmem");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("group_pol", &q_u->group_pol, ps, depth))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_QUERY_GROUPMEM structure.
-********************************************************************/
-
-void init_samr_r_query_groupmem(SAMR_R_QUERY_GROUPMEM * r_u,
-                               uint32 num_entries, uint32 *rid,
-                               uint32 *attr, NTSTATUS status)
-{
-       DEBUG(5, ("init_samr_r_query_groupmem\n"));
-
-       if (NT_STATUS_IS_OK(status)) {
-               r_u->ptr = 1;
-               r_u->num_entries = num_entries;
-
-               r_u->ptr_attrs = attr != NULL ? 1 : 0;
-               r_u->ptr_rids = rid != NULL ? 1 : 0;
-
-               r_u->num_rids = num_entries;
-               r_u->rid = rid;
-
-               r_u->num_attrs = num_entries;
-               r_u->attr = attr;
-       } else {
-               r_u->ptr = 0;
-               r_u->num_entries = 0;
-       }
-
-       r_u->status = status;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_query_groupmem(const char *desc, SAMR_R_QUERY_GROUPMEM * r_u,
-                             prs_struct *ps, int depth)
-{
-       uint32 i;
-
-       if (r_u == NULL)
-               return False;
-
-       if (UNMARSHALLING(ps))
-               ZERO_STRUCTP(r_u);
-
-       prs_debug(ps, depth, desc, "samr_io_r_query_groupmem");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
-               return False;
-       if(!prs_uint32("num_entries ", ps, depth, &r_u->num_entries))
-               return False;
-
-       if (r_u->ptr != 0) {
-               if(!prs_uint32("ptr_rids ", ps, depth, &r_u->ptr_rids))
-                       return False;
-               if(!prs_uint32("ptr_attrs", ps, depth, &r_u->ptr_attrs))
-                       return False;
-
-               if (r_u->ptr_rids != 0) {
-                       if(!prs_uint32("num_rids", ps, depth, &r_u->num_rids))
-                               return False;
-                       if (UNMARSHALLING(ps) && r_u->num_rids != 0) {
-                               r_u->rid = PRS_ALLOC_MEM(ps,uint32,r_u->num_rids);
-                               if (r_u->rid == NULL)
-                                       return False;
-                       }
-
-                       for (i = 0; i < r_u->num_rids; i++) {
-                               if(!prs_uint32("", ps, depth, &r_u->rid[i]))
-                                       return False;
-                       }
-               }
-
-               if (r_u->ptr_attrs != 0) {
-                       if(!prs_uint32("num_attrs", ps, depth, &r_u->num_attrs))
-                               return False;
-
-                       if (UNMARSHALLING(ps) && r_u->num_attrs != 0) {
-                               r_u->attr = PRS_ALLOC_MEM(ps,uint32,r_u->num_attrs);
-                               if (r_u->attr == NULL)
-                                       return False;
-                       }
-
-                       for (i = 0; i < r_u->num_attrs; i++) {
-                               if(!prs_uint32("", ps, depth, &r_u->attr[i]))
-                                       return False;
-                       }
-               }
-       }
-
-       if(!prs_ntstatus("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
 inits a SAMR_Q_QUERY_USERGROUPS structure.
 ********************************************************************/