diff options
author | Jean-François Micouleau <jfm@samba.org> | 2001-12-19 00:15:29 +0000 |
---|---|---|
committer | Jean-François Micouleau <jfm@samba.org> | 2001-12-19 00:15:29 +0000 |
commit | ea274ac97ff5c46c5f910c38b463d6a553dea9e6 (patch) | |
tree | e2d446bb414e427483c4430bb0cdbc8964608c52 /source3 | |
parent | dccc1ed3f8344968129c73104c1bdf8ab8b2a1e5 (diff) | |
download | samba-ea274ac97ff5c46c5f910c38b463d6a553dea9e6.tar.gz samba-ea274ac97ff5c46c5f910c38b463d6a553dea9e6.tar.bz2 samba-ea274ac97ff5c46c5f910c38b463d6a553dea9e6.zip |
added info level 1 to samr_query_alias()
(This used to be commit 589aa4fe226ee5bdae0a244631193714b0b556ac)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/include/rpc_samr.h | 11 | ||||
-rw-r--r-- | source3/rpc_parse/parse_samr.c | 61 | ||||
-rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 5 |
3 files changed, 77 insertions, 0 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 07c50d82d5..43ee342ed3 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -1136,6 +1136,16 @@ typedef struct q_samr_query_alias_info } SAMR_Q_QUERY_ALIASINFO; +typedef struct samr_alias_info1 +{ + UNIHDR hdr_acct_name; + UNIHDR hdr_acct_desc; + uint32 num_member; + UNISTR2 uni_acct_name; + UNISTR2 uni_acct_desc; + +} ALIAS_INFO1; + typedef struct samr_alias_info3 { UNIHDR hdr_acct_desc; @@ -1151,6 +1161,7 @@ typedef struct alias_info_ctr union { + ALIAS_INFO1 info1; ALIAS_INFO3 info3; } alias; diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 0c6bcdafb8..bfca495893 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -3432,6 +3432,63 @@ BOOL samr_io_r_enum_dom_aliases(char *desc, SAMR_R_ENUM_DOM_ALIASES * r_u, } /******************************************************************* +inits a ALIAS_INFO1 structure. +********************************************************************/ + +void init_samr_alias_info1(ALIAS_INFO1 * al1, char *acct_name, uint32 num_member, char *acct_desc) +{ + int acct_len_name = acct_name != NULL ? strlen(acct_name) : 0; + int acct_len_desc = acct_desc != NULL ? strlen(acct_desc) : 0; + + DEBUG(5, ("init_samr_alias_info1\n")); + + init_uni_hdr(&al1->hdr_acct_name, acct_len_name); + init_unistr2(&al1->uni_acct_name, acct_name, acct_len_name); + + al1->num_member=num_member; + + init_uni_hdr(&al1->hdr_acct_desc, acct_len_desc); + init_unistr2(&al1->uni_acct_desc, acct_desc, acct_len_desc); +} + +/******************************************************************* +reads or writes a structure. +********************************************************************/ + +BOOL samr_io_alias_info1(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(!smb_io_unihdr("hdr_acct_name", &al1->hdr_acct_name, ps, depth)) + return False; + if(!prs_uint32("num_member", ps, depth, &al1->num_member)) + return False; + if(!smb_io_unihdr("hdr_acct_desc", &al1->hdr_acct_desc, ps, depth)) + return False; + + if(!smb_io_unistr2("uni_acct_name", &al1->uni_acct_name, + al1->hdr_acct_name.buffer, ps, depth)) + return False; + + if(!prs_align(ps)) + return False; + + if(!smb_io_unistr2("uni_acct_desc", &al1->uni_acct_desc, + al1->hdr_acct_desc.buffer, ps, depth)) + return False; + + return True; +} + +/******************************************************************* inits a ALIAS_INFO3 structure. ********************************************************************/ @@ -3489,6 +3546,10 @@ BOOL samr_alias_info_ctr(char *desc, ALIAS_INFO_CTR * ctr, return False; switch (ctr->switch_value1) { + case 1: + if(!samr_io_alias_info1("alias_info1", &ctr->alias.info1, ps, depth)) + return False; + break; case 3: if(!samr_io_alias_info3("alias_info3", &ctr->alias.info3, ps, depth)) return False; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 78535e4c2b..b918b4dca1 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -1200,6 +1200,11 @@ NTSTATUS _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAM return NT_STATUS_NO_SUCH_ALIAS; switch (q_u->switch_level) { + case 1: + r_u->ptr = 1; + r_u->ctr.switch_value1 = 1; + init_samr_alias_info1(&r_u->ctr.alias.info1, map.nt_name, 1, map.comment); + break; case 3: r_u->ptr = 1; r_u->ctr.switch_value1 = 3; |