diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/byteorder.h | 12 | ||||
| -rw-r--r-- | source3/include/proto.h | 11 | ||||
| -rw-r--r-- | source3/include/rpc_secdes.h | 5 |
3 files changed, 13 insertions, 15 deletions
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h index 3371fd24cb..2a615e9dde 100644 --- a/source3/include/byteorder.h +++ b/source3/include/byteorder.h @@ -205,7 +205,7 @@ it also defines lots of intermediate macros, just ignore those :-) #define DBG_RW_PCVAL(charmode,string,depth,base,read,inbuf,outbuf,len) \ RW_PCVAL(read,inbuf,outbuf,len) \ DEBUG(5,("%s%04x %s: ", \ - tab_depth(depth), PTR_DIFF(inbuf,base),string)); \ + tab_depth(depth), base,string)); \ if (charmode) print_asc(5, (unsigned char*)(outbuf), (len)); else \ { int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%02x ", (outbuf)[idx])); } } \ DEBUG(5,("\n")); @@ -213,7 +213,7 @@ it also defines lots of intermediate macros, just ignore those :-) #define DBG_RW_PSVAL(charmode,string,depth,base,read,inbuf,outbuf,len) \ RW_PSVAL(read,inbuf,outbuf,len) \ DEBUG(5,("%s%04x %s: ", \ - tab_depth(depth), PTR_DIFF(inbuf,base),string)); \ + tab_depth(depth), base,string)); \ if (charmode) print_asc(5, (unsigned char*)(outbuf), 2*(len)); else \ { int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%04x ", (outbuf)[idx])); } } \ DEBUG(5,("\n")); @@ -221,7 +221,7 @@ it also defines lots of intermediate macros, just ignore those :-) #define DBG_RW_PIVAL(charmode,string,depth,base,read,inbuf,outbuf,len) \ RW_PIVAL(read,inbuf,outbuf,len) \ DEBUG(5,("%s%04x %s: ", \ - tab_depth(depth), PTR_DIFF(inbuf,base),string)); \ + tab_depth(depth), base,string)); \ if (charmode) print_asc(5, (unsigned char*)(outbuf), 4*(len)); else \ { int idx; for (idx = 0; idx < len; idx++) { DEBUG(5,("%08x ", (outbuf)[idx])); } } \ DEBUG(5,("\n")); @@ -229,15 +229,15 @@ it also defines lots of intermediate macros, just ignore those :-) #define DBG_RW_CVAL(string,depth,base,read,inbuf,outbuf) \ RW_CVAL(read,inbuf,outbuf,0) \ DEBUG(5,("%s%04x %s: %02x\n", \ - tab_depth(depth), PTR_DIFF(inbuf,base), string, outbuf)); + tab_depth(depth), base, string, outbuf)); #define DBG_RW_SVAL(string,depth,base,read,inbuf,outbuf) \ RW_SVAL(read,inbuf,outbuf,0) \ DEBUG(5,("%s%04x %s: %04x\n", \ - tab_depth(depth), PTR_DIFF(inbuf,base), string, outbuf)); + tab_depth(depth), base, string, outbuf)); #define DBG_RW_IVAL(string,depth,base,read,inbuf,outbuf) \ RW_IVAL(read,inbuf,outbuf,0) \ DEBUG(5,("%s%04x %s: %08x\n", \ - tab_depth(depth), PTR_DIFF(inbuf,base), string, outbuf)); + tab_depth(depth), base, string, outbuf)); diff --git a/source3/include/proto.h b/source3/include/proto.h index 7eb4f4e49d..1ed983d1a0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1610,9 +1610,12 @@ BOOL prs_unistr2(BOOL charmode, char *name, prs_struct *ps, int depth, UNISTR2 * BOOL prs_unistr3(BOOL charmode, char *name, UNISTR3 *str, prs_struct *ps, int depth); BOOL prs_unistr(char *name, prs_struct *ps, int depth, UNISTR *str); BOOL prs_string(char *name, prs_struct *ps, int depth, char *str, uint16 len, uint16 max_buf_size); -BOOL prs_uint16_pre(char *name, prs_struct *ps, int depth, uint16 *data16, uint32 *off_ptr); -BOOL prs_uint16_post(char *name, prs_struct *ps, int depth, +BOOL prs_uint16_pre(char *name, prs_struct *ps, int depth, uint16 *data16, uint32 *offset); +BOOL prs_uint16_post(char *name, prs_struct *ps, int depth, uint16 *data16, uint32 ptr_uint16, uint32 start_offset); +BOOL prs_uint32_pre(char *name, prs_struct *ps, int depth, uint32 *data32, uint32 *offset); +BOOL prs_uint32_post(char *name, prs_struct *ps, int depth, uint32 *data32, + uint32 ptr_uint32, uint32 start_offset); /*The following definitions come from rpc_parse/parse_reg.c */ @@ -1653,9 +1656,6 @@ void reg_io_r_close(char *desc, REG_R_CLOSE *r_u, prs_struct *ps, int depth); void make_reg_q_get_key_sec(REG_Q_GET_KEY_SEC *q_i, POLICY_HND *pol, uint32 buf_len, SEC_DESC_BUF *sec_buf); void reg_io_q_get_key_sec(char *desc, REG_Q_GET_KEY_SEC *r_q, prs_struct *ps, int depth); -void make_reg_r_get_key_sec(REG_R_GET_KEY_SEC *r_i, POLICY_HND *pol, - uint32 buf_len, uint8 *buf, - uint32 status); void reg_io_r_get_key_sec(char *desc, REG_R_GET_KEY_SEC *r_q, prs_struct *ps, int depth); void make_reg_q_info(REG_Q_INFO *q_i, POLICY_HND *pol, char *product_type, time_t unix_time, uint8 major, uint8 minor); @@ -1924,7 +1924,6 @@ void sec_io_info(char *desc, SEC_INFO *t, prs_struct *ps, int depth); void sec_io_ace(char *desc, SEC_ACE *t, prs_struct *ps, int depth); void sec_io_acl(char *desc, SEC_ACL *t, prs_struct *ps, int depth); void sec_io_desc(char *desc, SEC_DESC *t, prs_struct *ps, int depth); -void make_sec_desc_buf(SEC_DESC_BUF *buf, int len, uint32 buf_ptr); void sec_io_desc_buf(char *desc, SEC_DESC_BUF *sec, prs_struct *ps, int depth); /*The following definitions come from rpc_parse/parse_srv.c */ diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 587b31e3dc..1b438d3dfe 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -73,8 +73,7 @@ typedef struct security_acl_info /* SEC_DESC */ typedef struct security_descriptor_info { - uint16 unknown_1; /* 0x0001 */ - uint16 unknown_2; /* 0x8004 */ + uint32 unknown_1; /* 0x8004 0001 */ uint32 off_owner_sid; /* offset to owner sid */ uint32 off_pnt_sid ; /* offset to parent? sid */ @@ -94,7 +93,7 @@ typedef struct sec_desc_buf_info uint32 undoc; uint32 len; - SEC_DESC sec; + SEC_DESC *sec; } SEC_DESC_BUF; |