diff options
| -rw-r--r-- | source3/include/rpc_samr.h | 35 | ||||
| -rw-r--r-- | source3/rpc_client/cli_samr.c | 40 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_samr.c | 196 |
3 files changed, 0 insertions, 271 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 271ecbf5a9..2b233397f4 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -883,41 +883,6 @@ typedef struct r_samr_query_groupinfo_info /********************************************************/ - -typedef struct { - UNISTR4 name; - UNISTR4 description; - uint32 num_member; -} ALIAS_INFO1; - -typedef struct { - UNISTR4 name; -} ALIAS_INFO2; - -typedef struct { - UNISTR4 description; -} ALIAS_INFO3; - -typedef struct { - POLICY_HND pol; /* policy handle */ - uint16 level; /* 0x0003 seen */ -} SAMR_Q_QUERY_ALIASINFO; - -typedef struct { - uint16 level; - union { - ALIAS_INFO1 info1; - ALIAS_INFO2 info2; - ALIAS_INFO3 info3; - } alias; -} ALIAS_INFO_CTR; - -typedef struct { - ALIAS_INFO_CTR *ctr; - NTSTATUS status; -} SAMR_R_QUERY_ALIASINFO; - - /********************************************************/ /* SAMR_Q_QUERY_USERGROUPS - */ diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index d454f95617..19c59f2685 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -366,46 +366,6 @@ NTSTATUS rpccli_samr_enum_als_groups(struct rpc_pipe_client *cli, return result; } -/* Query alias info */ - -NTSTATUS rpccli_samr_query_alias_info(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - POLICY_HND *alias_pol, uint16 switch_value, - ALIAS_INFO_CTR *ctr) -{ - prs_struct qbuf, rbuf; - SAMR_Q_QUERY_ALIASINFO q; - SAMR_R_QUERY_ALIASINFO r; - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - - DEBUG(10,("cli_samr_query_alias_info\n")); - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - init_samr_q_query_aliasinfo(&q, alias_pol, switch_value); - - CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_QUERY_ALIASINFO, - q, r, - qbuf, rbuf, - samr_io_q_query_aliasinfo, - samr_io_r_query_aliasinfo, - NT_STATUS_UNSUCCESSFUL); - - /* Return output parameters */ - - if (!NT_STATUS_IS_OK(result = r.status)) { - goto done; - } - - *ctr = *r.ctr; - - 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 23fe7d0fc0..436e284fd5 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -2185,42 +2185,6 @@ void init_samr_alias_info1(struct samr_AliasInfoAll *r, } /******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_alias_info1(const char *desc, ALIAS_INFO1 * al1, - prs_struct *ps, int depth) -{ - if (al1 == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_alias_info1"); - depth++; - - if(!prs_align(ps)) - return False; - - if ( !prs_unistr4_hdr("name", ps, depth, &al1->name) ) - return False; - if ( !prs_uint32("num_member", ps, depth, &al1->num_member) ) - return False; - if ( !prs_unistr4_hdr("description", ps, depth, &al1->description) ) - return False; - - if ( !prs_unistr4_str("name", ps, depth, &al1->name) ) - return False; - if ( !prs_align(ps) ) - return False; - if ( !prs_unistr4_str("description", ps, depth, &al1->description) ) - return False; - if ( !prs_align(ps) ) - return False; - - return True; -} - - -/******************************************************************* inits a lsa_String structure. ********************************************************************/ @@ -2233,166 +2197,6 @@ void init_samr_alias_info3(struct lsa_String *r, } /******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_alias_info3(const char *desc, ALIAS_INFO3 *al3, - prs_struct *ps, int depth) -{ - if (al3 == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_alias_info3"); - depth++; - - if(!prs_align(ps)) - return False; - - if (!prs_unistr4("description", ps, depth, &al3->description)) - return False; - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_alias_info2(const char *desc, ALIAS_INFO2 *al2, - prs_struct *ps, int depth) -{ - if (al2 == NULL) - return False; - - prs_debug(ps, depth, desc, "samr_io_alias_info2"); - depth++; - - if(!prs_align(ps)) - return False; - - if (!prs_unistr4("name", ps, depth, &al2->name)) - return False; - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_alias_info_ctr(const char *desc, prs_struct *ps, int depth, ALIAS_INFO_CTR * ctr) -{ - if ( !ctr ) - return False; - - prs_debug(ps, depth, desc, "samr_alias_info_ctr"); - depth++; - - if ( !prs_uint16("level", ps, depth, &ctr->level) ) - return False; - - if(!prs_align(ps)) - return False; - switch (ctr->level) { - case 1: - if(!samr_io_alias_info1("alias_info1", &ctr->alias.info1, ps, depth)) - return False; - break; - case 2: - if(!samr_io_alias_info2("alias_info2", &ctr->alias.info2, ps, depth)) - return False; - break; - case 3: - if(!samr_io_alias_info3("alias_info3", &ctr->alias.info3, ps, depth)) - return False; - break; - default: - DEBUG(0,("samr_alias_info_ctr: unsupported switch level\n")); - break; - } - - return True; -} - -/******************************************************************* -inits a SAMR_Q_QUERY_ALIASINFO structure. -********************************************************************/ - -void init_samr_q_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO * q_e, - POLICY_HND *pol, uint32 switch_level) -{ - DEBUG(5, ("init_samr_q_query_aliasinfo\n")); - - q_e->pol = *pol; - q_e->level = switch_level; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_q_query_aliasinfo(const char *desc, SAMR_Q_QUERY_ALIASINFO *in, - prs_struct *ps, int depth) -{ - if ( !in ) - return False; - - prs_debug(ps, depth, desc, "samr_io_q_query_aliasinfo"); - depth++; - - if(!prs_align(ps)) - return False; - - if ( !smb_io_pol_hnd("pol", &(in->pol), ps, depth) ) - return False; - - if ( !prs_uint16("level", ps, depth, &in->level) ) - return False; - - return True; -} - -/******************************************************************* -inits a SAMR_R_QUERY_ALIASINFO structure. -********************************************************************/ - -void init_samr_r_query_aliasinfo(SAMR_R_QUERY_ALIASINFO *out, - ALIAS_INFO_CTR * ctr, NTSTATUS status) -{ - DEBUG(5, ("init_samr_r_query_aliasinfo\n")); - - out->ctr = ctr; - out->status = status; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ - -bool samr_io_r_query_aliasinfo(const char *desc, SAMR_R_QUERY_ALIASINFO *out, - prs_struct *ps, int depth) -{ - if ( !out ) - return False; - - prs_debug(ps, depth, desc, "samr_io_r_query_aliasinfo"); - depth++; - - if(!prs_align(ps)) - return False; - - if ( !prs_pointer("alias", ps, depth, (void*)&out->ctr, sizeof(ALIAS_INFO_CTR), (PRS_POINTER_CAST)samr_alias_info_ctr)) - return False; - if(!prs_align(ps)) - return False; - - if(!prs_ntstatus("status", ps, depth, &out->status)) - return False; - - return True; -} - -/******************************************************************* inits a SAMR_Q_LOOKUP_RIDS structure. ********************************************************************/ |