update the handmarshalled code in samr.cnf to handle ndr64 encoding
svn path=/trunk/; revision=30261
This commit is contained in:
parent
c8df8a78ac
commit
a6fb5ccdf2
|
@ -2082,7 +2082,7 @@ cnf_dissect_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
|
||||||
proto_tree *tree = NULL;
|
proto_tree *tree = NULL;
|
||||||
int old_offset;
|
int old_offset;
|
||||||
header_field_info *hf_info;
|
header_field_info *hf_info;
|
||||||
ALIGN_TO_4_BYTES;
|
ALIGN_TO_5_BYTES;
|
||||||
old_offset = offset;
|
old_offset = offset;
|
||||||
hf_info=proto_registrar_get_nth(hfindex);
|
hf_info=proto_registrar_get_nth(hfindex);
|
||||||
if (parent_tree) {
|
if (parent_tree) {
|
||||||
|
@ -2116,7 +2116,7 @@ cnf_dissect_hyper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
|
||||||
static int
|
static int
|
||||||
cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||||
{
|
{
|
||||||
guint32 len;
|
guint64 len;
|
||||||
dcerpc_info *di = NULL;
|
dcerpc_info *di = NULL;
|
||||||
e_ctx_hnd *polhnd = NULL;
|
e_ctx_hnd *polhnd = NULL;
|
||||||
dcerpc_call_value *dcv = NULL;
|
dcerpc_call_value *dcv = NULL;
|
||||||
|
@ -2127,7 +2127,7 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
|
||||||
/*just a run to handle conformant arrays, nothing to dissect */
|
/*just a run to handle conformant arrays, nothing to dissect */
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_4or8 (tvb, offset, pinfo, tree, drep,
|
||||||
hf_samr_sec_desc_buf_len, &len);
|
hf_samr_sec_desc_buf_len, &len);
|
||||||
dcv = (dcerpc_call_value *)di->call_data;
|
dcv = (dcerpc_call_value *)di->call_data;
|
||||||
if(dcv){
|
if(dcv){
|
||||||
|
@ -2161,14 +2161,14 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
|
||||||
static int
|
static int
|
||||||
cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||||
{
|
{
|
||||||
guint32 len;
|
guint64 len;
|
||||||
dcerpc_info *di;
|
dcerpc_info *di;
|
||||||
di=pinfo->private_data;
|
di=pinfo->private_data;
|
||||||
if(di->conformant_run){
|
if(di->conformant_run){
|
||||||
/*just a run to handle conformant arrays, nothing to dissect */
|
/*just a run to handle conformant arrays, nothing to dissect */
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_4or8 (tvb, offset, pinfo, tree, drep,
|
||||||
hf_samr_sec_desc_buf_len, &len);
|
hf_samr_sec_desc_buf_len, &len);
|
||||||
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
|
||||||
cnf_dissect_sec_desc_buf_, NDR_POINTER_UNIQUE,
|
cnf_dissect_sec_desc_buf_, NDR_POINTER_UNIQUE,
|
||||||
|
|
|
@ -151,10 +151,10 @@ PARAM_VALUE samr_dissect_element_GetDomPwInfo_domain_name_ 3|PIDL_SET_COL_INFO
|
||||||
PARAM_VALUE samr_dissect_element_CreateUser_account_name_ 3|PIDL_SET_COL_INFO|PIDL_STR_SAVE
|
PARAM_VALUE samr_dissect_element_CreateUser_account_name_ 3|PIDL_SET_COL_INFO|PIDL_STR_SAVE
|
||||||
PARAM_VALUE samr_dissect_element_CreateUser2_account_name_ 3|PIDL_SET_COL_INFO|PIDL_STR_SAVE
|
PARAM_VALUE samr_dissect_element_CreateUser2_account_name_ 3|PIDL_SET_COL_INFO|PIDL_STR_SAVE
|
||||||
|
|
||||||
TYPE lsa_String "offset=cnf_dissect_lsa_String(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 4
|
TYPE lsa_String "offset=cnf_dissect_lsa_String(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 5
|
||||||
TYPE lsa_AsciiString "offset=cnf_dissect_lsa_AsciiString(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 4
|
TYPE lsa_AsciiString "offset=cnf_dissect_lsa_AsciiString(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 5
|
||||||
TYPE lsa_StringLarge "offset=cnf_dissect_lsa_String(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 4
|
TYPE lsa_StringLarge "offset=cnf_dissect_lsa_String(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 5
|
||||||
TYPE lsa_AsciiStringLarge "offset=cnf_dissect_lsa_AsciiString(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 4
|
TYPE lsa_AsciiStringLarge "offset=cnf_dissect_lsa_AsciiString(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_STRING BASE_NONE 0 NULL 5
|
||||||
TYPE hyper "offset=cnf_dissect_hyper(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_UINT64 BASE_DEC 0 NULL 8
|
TYPE hyper "offset=cnf_dissect_hyper(tvb, offset, pinfo, tree, drep, @PARAM@, @HF@);" FT_UINT64 BASE_DEC 0 NULL 8
|
||||||
|
|
||||||
|
|
||||||
|
@ -366,7 +366,7 @@ cnf_dissect_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
|
||||||
int old_offset;
|
int old_offset;
|
||||||
header_field_info *hf_info;
|
header_field_info *hf_info;
|
||||||
|
|
||||||
ALIGN_TO_4_BYTES;
|
ALIGN_TO_5_BYTES;
|
||||||
|
|
||||||
old_offset = offset;
|
old_offset = offset;
|
||||||
hf_info=proto_registrar_get_nth(hfindex);
|
hf_info=proto_registrar_get_nth(hfindex);
|
||||||
|
@ -415,7 +415,7 @@ cnf_dissect_hyper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
|
||||||
static int
|
static int
|
||||||
cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||||
{
|
{
|
||||||
guint32 len;
|
guint64 len;
|
||||||
dcerpc_info *di = NULL;
|
dcerpc_info *di = NULL;
|
||||||
e_ctx_hnd *polhnd = NULL;
|
e_ctx_hnd *polhnd = NULL;
|
||||||
dcerpc_call_value *dcv = NULL;
|
dcerpc_call_value *dcv = NULL;
|
||||||
|
@ -423,12 +423,13 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
|
||||||
struct access_mask_info *ami=NULL;
|
struct access_mask_info *ami=NULL;
|
||||||
|
|
||||||
di=pinfo->private_data;
|
di=pinfo->private_data;
|
||||||
|
|
||||||
if(di->conformant_run){
|
if(di->conformant_run){
|
||||||
/*just a run to handle conformant arrays, nothing to dissect */
|
/*just a run to handle conformant arrays, nothing to dissect */
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_4or8 (tvb, offset, pinfo, tree, drep,
|
||||||
hf_samr_sec_desc_buf_len, &len);
|
hf_samr_sec_desc_buf_len, &len);
|
||||||
|
|
||||||
dcv = (dcerpc_call_value *)di->call_data;
|
dcv = (dcerpc_call_value *)di->call_data;
|
||||||
|
@ -467,7 +468,7 @@ cnf_dissect_sec_desc_buf_(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
|
||||||
static int
|
static int
|
||||||
cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep)
|
||||||
{
|
{
|
||||||
guint32 len;
|
guint64 len;
|
||||||
dcerpc_info *di;
|
dcerpc_info *di;
|
||||||
|
|
||||||
di=pinfo->private_data;
|
di=pinfo->private_data;
|
||||||
|
@ -476,7 +477,7 @@ cnf_dissect_sec_desc_buf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_4or8 (tvb, offset, pinfo, tree, drep,
|
||||||
hf_samr_sec_desc_buf_len, &len);
|
hf_samr_sec_desc_buf_len, &len);
|
||||||
|
|
||||||
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
|
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
|
||||||
|
|
Loading…
Reference in New Issue