Remove unused marshalling for SAMR_QUERY_SEC_OBJ.

Guenther

diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index fa8bf07564f9c62f7beef836d9f0da399ff36ac9..4ebee5ed1d25d677624522e2e790c408ef67b984 100644 (file)
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -492,29 +492,6 @@ typedef struct r_samr_set_sec_obj_info
 } SAMR_R_SET_SEC_OBJ;
 
 
-/****************************************************************************
-SAMR_Q_QUERY_SEC_OBJ - info level 4.  returns SIDs.
-*****************************************************************************/
-
-/* SAMR_Q_QUERY_SEC_OBJ - probably get domain info... */
-typedef struct q_samr_query_sec_obj_info
-{
-       POLICY_HND user_pol;          /* policy handle */
-       uint32 sec_info;     /* xxxx_SECURITY_INFORMATION 0x0000 0004 */
-
-} SAMR_Q_QUERY_SEC_OBJ;
-
-/* SAMR_R_QUERY_SEC_OBJ - probably an open */
-typedef struct r_samr_query_sec_obj_info
-{
-       uint32 ptr;
-       SEC_DESC_BUF *buf;
-
-       NTSTATUS status;         /* return status */
-
-} SAMR_R_QUERY_SEC_OBJ;
-
-
 /****************************************************************************
 SAMR_Q_QUERY_DOMAIN_INFO - probably a query on domain group info.
 *****************************************************************************/

diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index fa1e5a645bf96b10097e1475ad928998120c09dc..4362c2bc8b2fd3e369eb30c21bc7463a03bdf6d7 100644 (file)
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -1497,41 +1497,6 @@ NTSTATUS rpccli_samr_remove_sid_foreign_domain(struct rpc_pipe_client *cli,
        return result;
 }
 
-/* Query user security object */
-
-NTSTATUS rpccli_samr_query_sec_obj(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                 POLICY_HND *user_pol, uint32 sec_info, 
-                                 TALLOC_CTX *ctx, SEC_DESC_BUF **sec_desc_buf)
-{
-       prs_struct qbuf, rbuf;
-       SAMR_Q_QUERY_SEC_OBJ q;
-       SAMR_R_QUERY_SEC_OBJ r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       DEBUG(10,("cli_samr_query_sec_obj\n"));
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-
-       init_samr_q_query_sec_obj(&q, user_pol, sec_info);
-
-       CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_SEC_OBJECT,
-               q, r,
-               qbuf, rbuf,
-               samr_io_q_query_sec_obj,
-               samr_io_r_query_sec_obj,
-               NT_STATUS_UNSUCCESSFUL); 
-
-       /* Return output parameters */
-
-       result = r.status;
-       *sec_desc_buf=dup_sec_desc_buf(ctx, r.buf);
-
-       return result;
-}
-
 /* Set user security object */
 
 NTSTATUS rpccli_samr_set_sec_obj(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,

diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 9924a164a1b26ad5ab71d4001d8e860d671af9e3..a58b621eaba02a1b20606ca8febaa9ca08dd20d3 100644 (file)
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -294,45 +294,6 @@ bool samr_io_q_set_sec_obj(const char *desc, SAMR_Q_SET_SEC_OBJ * q_u,
 }
 
 
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-void init_samr_q_query_sec_obj(SAMR_Q_QUERY_SEC_OBJ * q_u,
-                              POLICY_HND *user_pol, uint32 sec_info)
-{
-       DEBUG(5, ("samr_init_samr_q_query_sec_obj\n"));
-
-       q_u->user_pol = *user_pol;
-       q_u->sec_info = sec_info;
-}
-
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_query_sec_obj(const char *desc, SAMR_Q_QUERY_SEC_OBJ * q_u,
-                            prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "samr_io_q_query_sec_obj");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("user_pol", &q_u->user_pol, ps, depth))
-               return False;
-
-       if(!prs_uint32("sec_info", ps, depth, &q_u->sec_info))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
@@ -932,35 +893,6 @@ bool samr_io_r_set_sec_obj(const char *desc, SAMR_R_SET_SEC_OBJ * r_u,
        return True;
 }
 
-/*******************************************************************
-reads or writes a SAMR_R_QUERY_SEC_OBJ structure.
-********************************************************************/
-
-bool samr_io_r_query_sec_obj(const char *desc, SAMR_R_QUERY_SEC_OBJ * r_u,
-                            prs_struct *ps, int depth)
-{
-       if (r_u == NULL)
-               return False;
-  
-       prs_debug(ps, depth, desc, "samr_io_r_query_sec_obj");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr", ps, depth, &r_u->ptr))
-               return False;
-       if (r_u->ptr != 0) {
-               if(!sec_io_desc_buf("sec", &r_u->buf, ps, depth))
-                       return False;
-       }
-
-       if(!prs_ntstatus("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
 reads or writes a SAM_STR1 structure.
 ********************************************************************/