BOOL smb_io_string2(char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth);
BOOL make_unistr2(UNISTR2 *str, const char *buf, int len);
BOOL smb_io_unistr2(char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth);
-BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint8 type, uint32 idx);
+BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx);
BOOL smb_io_dom_rid2(char *desc, DOM_RID2 *rid2, prs_struct *ps, int depth);
BOOL make_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type);
BOOL smb_io_dom_rid3(char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth);
/* LSA_TRANS_NAME - translated name */
typedef struct lsa_trans_name_info
{
- uint32 sid_name_use; /* value is 5 for a well-known group; 2 for a domain group; 1 for a user... */
+ uint16 sid_name_use; /* value is 5 for a well-known group; 2 for a domain group; 1 for a user... */
UNIHDR hdr_name;
uint32 domain_idx; /* index into DOM_R_REF array of SIDs */
/* DOM_RID2 - domain RID structure for ntlsa pipe */
typedef struct domrid2_info
{
- uint8 type; /* value is SID_NAME_USE enum */
+ uint16 type; /* value is SID_NAME_USE enum */
uint32 rid;
uint32 rid_idx; /* referenced domain index */
/*The following definitions come from rpc_parse/parse_lsa.c */
BOOL make_lsa_trans_name(LSA_TRANS_NAME * trn, UNISTR2 * uni_name,
- uint32 sid_name_use, char *name, uint32 idx);
+ uint16 sid_name_use, char *name, uint32 idx);
int make_dom_ref_uni(DOM_R_REF * ref, const UNISTR2 * uni_domname,
const DOM_SID * dom_sid);
int make_dom_ref(DOM_R_REF * ref, const char *domname,
BOOL smb_io_string2(char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth);
BOOL make_unistr2(UNISTR2 *str, const char *buf, int len);
BOOL smb_io_unistr2(char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth);
-BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint8 type, uint32 idx);
+BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx);
BOOL smb_io_dom_rid2(char *desc, DOM_RID2 *rid2, prs_struct *ps, int depth);
BOOL make_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type);
BOOL smb_io_dom_rid3(char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth);
/*The following definitions come from rpc_parse/parse_lsa.c */
BOOL make_lsa_trans_name(LSA_TRANS_NAME * trn, UNISTR2 * uni_name,
- uint32 sid_name_use, char *name, uint32 idx);
+ uint16 sid_name_use, char *name, uint32 idx);
int make_dom_ref_uni(DOM_R_REF * ref, const UNISTR2 * uni_domname,
const DOM_SID * dom_sid);
int make_dom_ref(DOM_R_REF * ref, const char *domname,
creates a LSA_TRANS_NAME structure.
********************************************************************/
BOOL make_lsa_trans_name(LSA_TRANS_NAME * trn, UNISTR2 * uni_name,
- uint32 sid_name_use, char *name, uint32 idx)
+ uint16 sid_name_use, char *name, uint32 idx)
{
int len_name = strlen(name);
prs_align(ps);
- prs_uint32("sid_name_use", ps, depth, &(trn->sid_name_use));
- smb_io_unihdr("hdr_name", &(trn->hdr_name), ps, depth);
- prs_uint32("domain_idx ", ps, depth, &(trn->domain_idx));
+ prs_uint16("sid_name_use", ps, depth, &trn->sid_name_use);
+ prs_align(ps);
+ smb_io_unihdr("hdr_name", &trn->hdr_name, ps, depth);
+ prs_uint32("domain_idx ", ps, depth, &trn->domain_idx);
return True;
}
/*******************************************************************
creates a DOM_RID2 structure.
********************************************************************/
-BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint8 type, uint32 idx)
+BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx)
{
rid2->type = type;
rid2->rid = rid;
prs_align(ps);
- prs_uint8("type ", ps, depth, &(rid2->type));
+ prs_uint16("type ", ps, depth, &(rid2->type));
prs_align(ps);
prs_uint32("rid ", ps, depth, &(rid2->rid ));
prs_uint32("rid_idx", ps, depth, &(rid2->rid_idx ));