Remove unused marshalling for SAMR_SET_DOMAIN_INFO.

Guenther
(This used to be commit c67581e1e49f7049d2ff25efe310593d19b1a0fb)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index ff50edbc8d79a46700b293e48337fab9f9b1b57b..10a3d0c6f2a1b33b9f6698d31c772741da429c18 100644 (file)
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -1354,21 +1354,4 @@ typedef struct sid_info_3
 
 } DOM_SID3;
 
-/* SAMR_Q_SET_DOMAIN_INFO */
-typedef struct q_samr_set_domain_info
-{
-       POLICY_HND domain_pol;   /* policy handle */
-       uint16 switch_value0;
-       uint16 switch_value;
-       SAM_UNK_CTR *ctr;
-
-} SAMR_Q_SET_DOMAIN_INFO;
-
-/* SAMR_R_SET_DOMAIN_INFO */
-typedef struct r_samr_set_domain_info
-{
-       NTSTATUS status;         /* return status */
-
-} SAMR_R_SET_DOMAIN_INFO;
-
 #endif /* _RPC_SAMR_H */

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index df3fa30b15807d4ce4ec8bcabbc64b7162739933..4765e529be78602a314a3b701cefda70a3805d29 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -467,46 +467,6 @@ NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX *m
        return result;
 }
 
-/* Set domain info */
-
-NTSTATUS rpccli_samr_set_domain_info(struct rpc_pipe_client *cli,
-                                    TALLOC_CTX *mem_ctx, 
-                                    POLICY_HND *domain_pol,
-                                    uint16 switch_value,
-                                    SAM_UNK_CTR *ctr)
-{
-       prs_struct qbuf, rbuf;
-       SAMR_Q_SET_DOMAIN_INFO q;
-       SAMR_R_SET_DOMAIN_INFO r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       DEBUG(10,("cli_samr_set_domain_info\n"));
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-
-       init_samr_q_set_domain_info(&q, domain_pol, switch_value, ctr);
-
-       CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_SET_DOMAIN_INFO,
-               q, r,
-               qbuf, rbuf,
-               samr_io_q_set_domain_info,
-               samr_io_r_set_domain_info,
-               NT_STATUS_UNSUCCESSFUL); 
-
-       /* Return output parameters */
-
-       if (!NT_STATUS_IS_OK(result = r.status)) {
-               goto done;
-       }
-
- done:
-
-       return result;
-}
-
 /* User change password */
 
 NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli,

diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 39de1a82f61ef471b8d5ac2b9fe2070ba8b10a75..fc6b493f0de5d1f5c54d1e49d4900bbeed33f9c2 100644 (file)
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -5500,125 +5500,3 @@ bool samr_io_r_chgpasswd_user3(const char *desc, SAMR_R_CHGPASSWD_USER3 *r_u,
 
        return True;
 }
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-void init_samr_q_set_domain_info(SAMR_Q_SET_DOMAIN_INFO *q_u,
-                               POLICY_HND *domain_pol, uint16 switch_value, SAM_UNK_CTR *ctr)
-{
-       DEBUG(5, ("init_samr_q_set_domain_info\n"));
-
-       q_u->domain_pol = *domain_pol;
-       q_u->switch_value0 = switch_value;
-
-       q_u->switch_value = switch_value;
-       q_u->ctr = ctr;
-       
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_set_domain_info(const char *desc, SAMR_Q_SET_DOMAIN_INFO *q_u,
-                             prs_struct *ps, int depth)
-{
-       if (q_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "samr_io_q_set_domain_info");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("domain_pol", &q_u->domain_pol, ps, depth))
-               return False;
-
-       if(!prs_uint16("switch_value0", ps, depth, &q_u->switch_value0))
-               return False;
-
-       if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if ((q_u->ctr = PRS_ALLOC_MEM(ps, SAM_UNK_CTR, 1)) == NULL)
-                       return False;
-       }
-       
-       switch (q_u->switch_value) {
-
-       case 0x0c:
-               if(!sam_io_unk_info12("unk_inf12", &q_u->ctr->info.inf12, ps, depth))
-                       return False;
-               break;
-       case 0x07:
-               if(!sam_io_unk_info7("unk_inf7",&q_u->ctr->info.inf7, ps,depth))
-                       return False;
-               break;
-       case 0x06:
-               if(!sam_io_unk_info6("unk_inf6",&q_u->ctr->info.inf6, ps,depth))
-                       return False;
-               break;
-       case 0x05:
-               if(!sam_io_unk_info5("unk_inf5",&q_u->ctr->info.inf5, ps,depth))
-                       return False;
-               break;
-       case 0x03:
-               if(!sam_io_unk_info3("unk_inf3",&q_u->ctr->info.inf3, ps,depth))
-                       return False;
-               break;
-       case 0x02:
-               if(!sam_io_unk_info2("unk_inf2",&q_u->ctr->info.inf2, ps,depth))
-                       return False;
-               break;
-       case 0x01:
-               if(!sam_io_unk_info1("unk_inf1",&q_u->ctr->info.inf1, ps,depth))
-                       return False;
-               break;
-       default:
-               DEBUG(0, ("samr_io_r_samr_unknown_2e: unknown switch level 0x%x\n",
-                       q_u->switch_value));
-               return False;
-       }
-
-       return True;
-}
-
-/*******************************************************************
-inits a SAMR_R_QUERY_DOMAIN_INFO structure.
-********************************************************************/
-
-void init_samr_r_set_domain_info(SAMR_R_SET_DOMAIN_INFO * r_u, NTSTATUS status)
-{
-       DEBUG(5, ("init_samr_r_set_domain_info\n"));
-
-       r_u->status = status;   /* return status */
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_set_domain_info(const char *desc, SAMR_R_SET_DOMAIN_INFO * r_u,
-                             prs_struct *ps, int depth)
-{
-        if (r_u == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "samr_io_r_samr_unknown_2e");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_ntstatus("status", ps, depth, &r_u->status))
-               return False;
-       
-       return True;
-}