From b69a590f6bec4219879beb87dc375417153983a2 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 12 Feb 2008 01:31:32 +0100 Subject: Remove unused marshalling for SAMR_SET_USERINFO2. Guenther (This used to be commit d493f98cd1da5e8a5995e3adea2f28b434baae99) --- source3/include/rpc_samr.h | 17 --------- source3/rpc_client/cli_samr.c | 43 --------------------- source3/rpc_parse/parse_samr.c | 87 ------------------------------------------ 3 files changed, 147 deletions(-) diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index fa3feaea28..a11106fc20 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -553,23 +553,6 @@ typedef struct sam_userinfo_ctr_info } SAM_USERINFO_CTR; -/* SAMR_Q_SET_USERINFO2 - set sam info */ -typedef struct q_samr_set_user_info2 -{ - POLICY_HND pol; /* policy handle associated with user */ - uint16 switch_value; /* 0x0010 */ - - SAM_USERINFO_CTR *ctr; - -} SAMR_Q_SET_USERINFO2; - -/* SAMR_R_SET_USERINFO2 - set sam info */ -typedef struct r_samr_set_user_info2 -{ - NTSTATUS status; /* return status */ - -} SAMR_R_SET_USERINFO2; - /* SAMR_Q_SET_USERINFO - set sam info */ typedef struct q_samr_set_user_info { diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 3649c516a0..caf58d384b 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -513,46 +513,3 @@ NTSTATUS rpccli_samr_set_userinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c return result; } - -/* Set userinfo2 */ - -NTSTATUS rpccli_samr_set_userinfo2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - const POLICY_HND *user_pol, uint16 switch_value, - DATA_BLOB *sess_key, SAM_USERINFO_CTR *ctr) -{ - prs_struct qbuf, rbuf; - SAMR_Q_SET_USERINFO2 q; - SAMR_R_SET_USERINFO2 r; - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - - DEBUG(10,("cli_samr_set_userinfo2\n")); - - if (!sess_key->length) { - DEBUG(1, ("No user session key\n")); - return NT_STATUS_NO_USER_SESSION_KEY; - } - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - init_samr_q_set_userinfo2(&q, user_pol, sess_key, switch_value, ctr); - - CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_SET_USERINFO2, - q, r, - qbuf, rbuf, - samr_io_q_set_userinfo2, - samr_io_r_set_userinfo2, - NT_STATUS_UNSUCCESSFUL); - - /* Return output parameters */ - - if (!NT_STATUS_IS_OK(result = r.status)) { - goto done; - } - - done: - - return result; -} diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 954a60d443..5cfd1edfee 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -2117,90 +2117,3 @@ bool samr_io_r_set_userinfo(const char *desc, SAMR_R_SET_USERINFO * r_u, return True; } - -/******************************************************************* -inits a SAMR_Q_SET_USERINFO2 structure. -********************************************************************/ - -void init_samr_q_set_userinfo2(SAMR_Q_SET_USERINFO2 * q_u, - const POLICY_HND *hnd, DATA_BLOB *sess_key, - uint16 switch_value, SAM_USERINFO_CTR * ctr) -{ - DEBUG(5, ("init_samr_q_set_userinfo2\n")); - - q_u->pol = *hnd; - q_u->switch_value = switch_value; - q_u->ctr = ctr; - - q_u->ctr->switch_value = switch_value; - - switch (switch_value) { - case 18: - SamOEMhashBlob(ctr->info.id18->lm_pwd, 16, sess_key); - SamOEMhashBlob(ctr->info.id18->nt_pwd, 16, sess_key); - dump_data(100, sess_key->data, sess_key->length); - dump_data(100, ctr->info.id18->lm_pwd, 16); - dump_data(100, ctr->info.id18->nt_pwd, 16); - break; - } -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_q_set_userinfo2(const char *desc, SAMR_Q_SET_USERINFO2 * q_u, - prs_struct *ps, int depth) -{ - if (q_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_q_set_userinfo2"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("pol", &q_u->pol, ps, depth)) - return False; - - if(!prs_uint16("switch_value", ps, depth, &q_u->switch_value)) - return False; - if(!samr_io_userinfo_ctr("ctr", &q_u->ctr, ps, depth)) - return False; - - return True; -} - -/******************************************************************* -inits a SAMR_R_SET_USERINFO2 structure. -********************************************************************/ - -void init_samr_r_set_userinfo2(SAMR_R_SET_USERINFO2 * r_u, NTSTATUS status) -{ - DEBUG(5, ("init_samr_r_set_userinfo2\n")); - - r_u->status = status; /* return status */ -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_r_set_userinfo2(const char *desc, SAMR_R_SET_USERINFO2 * r_u, - prs_struct *ps, int depth) -{ - if (r_u == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_r_set_userinfo2"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!prs_ntstatus("status", ps, depth, &r_u->status)) - return False; - - return True; -} -- cgit