diff options
Diffstat (limited to 'source/rpc_parse/parse_reg.c')
-rw-r--r-- | source/rpc_parse/parse_reg.c | 1103 |
1 files changed, 611 insertions, 492 deletions
diff --git a/source/rpc_parse/parse_reg.c b/source/rpc_parse/parse_reg.c index a51b4269e3a..a67a3973b95 100644 --- a/source/rpc_parse/parse_reg.c +++ b/source/rpc_parse/parse_reg.c @@ -6,8 +6,7 @@ * Copyright (C) Paul Ashton 1997. * Copyright (C) Marc Jacobsen 1999. * Copyright (C) Simo Sorce 2000. - * Copyright (C) Jeremy Cooper 2004 - * Copyright (C) Gerald Carter 2002-2005. + * Copyright (C) Gerald Carter 2002. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,10 +29,10 @@ #define DBGC_CLASS DBGC_RPC_PARSE /******************************************************************* - Fill in a REGVAL_BUFFER for the data given a REGISTRY_VALUE + Fill in a BUFFER2 for the data given a REGISTRY_VALUE *******************************************************************/ -static uint32 reg_init_regval_buffer( REGVAL_BUFFER *buf2, REGISTRY_VALUE *val ) +static uint32 reg_init_buffer2( BUFFER2 *buf2, REGISTRY_VALUE *val ) { uint32 real_size = 0; @@ -41,72 +40,151 @@ static uint32 reg_init_regval_buffer( REGVAL_BUFFER *buf2, REGISTRY_VALUE *val ) return 0; real_size = regval_size(val); - init_regval_buffer( buf2, (unsigned char*)regval_data_p(val), real_size ); + init_buffer2( buf2, (unsigned char*)regval_data_p(val), real_size ); return real_size; } /******************************************************************* - Inits a hive connect request structure + Inits a structure. ********************************************************************/ -void init_reg_q_open_hive( REG_Q_OPEN_HIVE *q_o, uint32 access_desired ) +void init_reg_q_open_hkcr(REG_Q_OPEN_HKCR *q_o, + uint16 unknown_0, uint32 level) { - - q_o->server = TALLOC_P( get_talloc_ctx(), uint16); - *q_o->server = 0x1; - - q_o->access = access_desired; + q_o->ptr = 1; + q_o->unknown_0 = unknown_0; + q_o->unknown_1 = 0x0; /* random - changes */ + q_o->level = level; } /******************************************************************* -Marshalls a hive connect request +reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_open_hive(const char *desc, REG_Q_OPEN_HIVE *q_u, - prs_struct *ps, int depth) +BOOL reg_io_q_open_hkcr(const char *desc, REG_Q_OPEN_HKCR *r_q, prs_struct *ps, int depth) { - prs_debug(ps, depth, desc, "reg_io_q_open_hive"); + if (r_q == NULL) + return False; + + prs_debug(ps, depth, desc, "reg_io_q_open_hkcr"); depth++; if(!prs_align(ps)) return False; - if(!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) + if(!prs_uint32("ptr ", ps, depth, &r_q->ptr)) return False; - if(!prs_uint32("access", ps, depth, &q_u->access)) - return False; + if (r_q->ptr != 0) { + if(!prs_uint16("unknown_0", ps, depth, &r_q->unknown_0)) + return False; + if(!prs_uint16("unknown_1", ps, depth, &r_q->unknown_1)) + return False; + if(!prs_uint32("level ", ps, depth, &r_q->level)) + return False; + } return True; } /******************************************************************* -Unmarshalls a hive connect response +reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_open_hive(const char *desc, REG_R_OPEN_HIVE *r_u, - prs_struct *ps, int depth) +BOOL reg_io_r_open_hkcr(const char *desc, REG_R_OPEN_HKCR *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_open_hive"); + prs_debug(ps, depth, desc, "reg_io_r_open_hkcr"); depth++; if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &r_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_r->pol, ps, depth)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) + return False; + + return True; +} + +/******************************************************************* + Inits a structure. +********************************************************************/ + +void init_reg_q_open_hklm(REG_Q_OPEN_HKLM * q_o, + uint16 unknown_0, uint32 access_mask) +{ + q_o->ptr = 1; + q_o->unknown_0 = unknown_0; + q_o->unknown_1 = 0x0; /* random - changes */ + q_o->access_mask = access_mask; + +} + +/******************************************************************* +reads or writes a structure. +********************************************************************/ +BOOL reg_io_q_open_hklm(const char *desc, REG_Q_OPEN_HKLM * r_q, prs_struct *ps, + int depth) +{ + if (r_q == NULL) + return False; + + prs_debug(ps, depth, desc, "reg_io_q_open_hklm"); + depth++; + + if (!prs_align(ps)) + return False; + + if (!prs_uint32("ptr ", ps, depth, &(r_q->ptr))) + return False; + if (r_q->ptr != 0) + { + if (!prs_uint16("unknown_0", ps, depth, &(r_q->unknown_0))) + return False; + if (!prs_uint16("unknown_1", ps, depth, &(r_q->unknown_1))) + return False; + if (!prs_uint32("access_mask", ps, depth, &(r_q->access_mask))) + return False; + } + + return True; +} + + +/******************************************************************* +reads or writes a structure. +********************************************************************/ +BOOL reg_io_r_open_hklm(const char *desc, REG_R_OPEN_HKLM * r_r, prs_struct *ps, + int depth) +{ + if (r_r == NULL) + return False; + + prs_debug(ps, depth, desc, "reg_io_r_open_hklm"); + depth++; + + if (!prs_align(ps)) + return False; + + if (!smb_io_pol_hnd("", &r_r->pol, ps, depth)) + return False; + + if (!prs_werror("status", ps, depth, &r_r->status)) return False; return True; } + + + /******************************************************************* Inits a structure. ********************************************************************/ @@ -120,9 +198,9 @@ void init_reg_q_flush_key(REG_Q_FLUSH_KEY *q_u, POLICY_HND *pol) reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_flush_key(const char *desc, REG_Q_FLUSH_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_flush_key(const char *desc, REG_Q_FLUSH_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_flush_key"); @@ -131,20 +209,19 @@ BOOL reg_io_q_flush_key(const char *desc, REG_Q_FLUSH_KEY *q_u, prs_struct *ps, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; return True; } /******************************************************************* -Unmarshalls a registry key flush response +reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_flush_key(const char *desc, REG_R_FLUSH_KEY *r_u, - prs_struct *ps, int depth) +BOOL reg_io_r_flush_key(const char *desc, REG_R_FLUSH_KEY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_flush_key"); @@ -153,7 +230,7 @@ BOOL reg_io_r_flush_key(const char *desc, REG_R_FLUSH_KEY *r_u, if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -163,14 +240,12 @@ BOOL reg_io_r_flush_key(const char *desc, REG_R_FLUSH_KEY *r_u, reads or writes SEC_DESC_BUF and SEC_DATA structures. ********************************************************************/ -static BOOL reg_io_hdrbuf_sec(uint32 ptr, uint32 *ptr3, BUFHDR *hdr_sec, - SEC_DESC_BUF *data, prs_struct *ps, int depth) +static BOOL reg_io_hdrbuf_sec(uint32 ptr, uint32 *ptr3, BUFHDR *hdr_sec, SEC_DESC_BUF *data, prs_struct *ps, int depth) { if (ptr != 0) { uint32 hdr_offset; uint32 old_offset; - if(!smb_io_hdrbuf_pre("hdr_sec", hdr_sec, ps, depth, - &hdr_offset)) + if(!smb_io_hdrbuf_pre("hdr_sec", hdr_sec, ps, depth, &hdr_offset)) return False; old_offset = prs_offset(ps); @@ -181,16 +256,14 @@ static BOOL reg_io_hdrbuf_sec(uint32 ptr, uint32 *ptr3, BUFHDR *hdr_sec, } if (ptr3 == NULL || *ptr3 != 0) { - /* JRA - this next line is probably wrong... */ - if(!sec_io_desc_buf("data ", &data, ps, depth)) + if(!sec_io_desc_buf("data ", &data, ps, depth)) /* JRA - this line is probably wrong... */ return False; } - if(!smb_io_hdrbuf_post("hdr_sec", hdr_sec, ps, depth, - hdr_offset, data->max_len, data->len)) + if(!smb_io_hdrbuf_post("hdr_sec", hdr_sec, ps, depth, hdr_offset, + data->max_len, data->len)) return False; - if(!prs_set_offset(ps, old_offset + data->len + - sizeof(uint32) * ((ptr3 != NULL) ? 5 : 3))) + if(!prs_set_offset(ps, old_offset + data->len + sizeof(uint32) * ((ptr3 != NULL) ? 5 : 3))) return False; if(!prs_align(ps)) @@ -201,25 +274,28 @@ static BOOL reg_io_hdrbuf_sec(uint32 ptr, uint32 *ptr3, BUFHDR *hdr_sec, } /******************************************************************* - Inits a registry key create request + Inits a structure. ********************************************************************/ void init_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd, - char *name, char *class, uint32 access_desired, - SEC_DESC_BUF *sec_buf) + char *name, char *class, SEC_ACCESS *sam_access, + SEC_DESC_BUF *sec_buf) { ZERO_STRUCTP(q_c); memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol)); + init_unistr2(&q_c->uni_name, name, UNI_STR_TERMINATE); + init_uni_hdr(&q_c->hdr_name, &q_c->uni_name); - init_unistr4( &q_c->name, name, UNI_STR_TERMINATE ); - init_unistr4( &q_c->class, class, UNI_STR_TERMINATE ); + init_unistr2(&q_c->uni_class, class, UNI_STR_TERMINATE); + init_uni_hdr(&q_c->hdr_class, &q_c->uni_class); - q_c->access = access_desired; + q_c->reserved = 0x00000000; + memcpy(&q_c->sam_access, sam_access, sizeof(q_c->sam_access)); - q_c->sec_info = TALLOC_P( get_talloc_ctx(), uint32 ); - *q_c->sec_info = DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION; + q_c->ptr1 = 1; + q_c->sec_info = DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION; q_c->data = sec_buf; q_c->ptr2 = 1; @@ -229,13 +305,12 @@ void init_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd, } /******************************************************************* -Marshalls a registry key create request +reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_create_key(const char *desc, REG_Q_CREATE_KEY *q_u, - prs_struct *ps, int depth) +BOOL reg_io_q_create_key(const char *desc, REG_Q_CREATE_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_create_key"); @@ -244,49 +319,54 @@ BOOL reg_io_q_create_key(const char *desc, REG_Q_CREATE_KEY *q_u, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pnt_pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth)) return False; - if(!prs_unistr4 ("name", ps, depth, &q_u->name)) + if(!smb_io_unihdr ("", &r_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_unistr4 ("class", ps, depth, &q_u->class)) + if(!smb_io_unihdr ("", &r_q->hdr_class, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_q->uni_class, r_q->hdr_class.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("reserved", ps, depth, &q_u->reserved)) + if(!prs_uint32("reserved", ps, depth, &r_q->reserved)) return False; - if(!prs_uint32("access", ps, depth, &q_u->access)) + if(!sec_io_access("sam_access", &r_q->sam_access, ps, depth)) return False; - if(!prs_pointer("sec_info", ps, depth, (void**)&q_u->sec_info, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr1", ps, depth, &r_q->ptr1)) return False; - if(!prs_uint32("ptr2", ps, depth, &q_u->ptr2)) + if (r_q->ptr1 != 0) { + if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info)) + return False; + } + + if(!prs_uint32("ptr2", ps, depth, &r_q->ptr2)) return False; - if(!reg_io_hdrbuf_sec(q_u->ptr2, &q_u->ptr3, &q_u->hdr_sec, q_u->data, - ps, depth)) + if(!reg_io_hdrbuf_sec(r_q->ptr2, &r_q->ptr3, &r_q->hdr_sec, r_q->data, ps, depth)) return False; -#if 0 - if(!prs_uint32("unknown_2", ps, depth, &q_u->unknown_2)) + if(!prs_uint32("unknown_2", ps, depth, &r_q->unknown_2)) return False; -#endif return True; } /******************************************************************* -Unmarshalls a registry key create response +reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_create_key(const char *desc, REG_R_CREATE_KEY *r_u, - prs_struct *ps, int depth) +BOOL reg_io_r_create_key(const char *desc, REG_R_CREATE_KEY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_create_key"); @@ -295,12 +375,12 @@ BOOL reg_io_r_create_key(const char *desc, REG_R_CREATE_KEY *r_u, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &r_u->key_pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_r->key_pol, ps, depth)) return False; - if(!prs_uint32("unknown", ps, depth, &r_u->unknown)) + if(!prs_uint32("unknown", ps, depth, &r_r->unknown)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -312,22 +392,23 @@ BOOL reg_io_r_create_key(const char *desc, REG_R_CREATE_KEY *r_u, ********************************************************************/ void init_reg_q_delete_val(REG_Q_DELETE_VALUE *q_c, POLICY_HND *hnd, - char *name) + char *name) { ZERO_STRUCTP(q_c); memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol)); - init_unistr4(&q_c->name, name, UNI_STR_TERMINATE); + + init_unistr2(&q_c->uni_name, name, UNI_STR_TERMINATE); + init_uni_hdr(&q_c->hdr_name, &q_c->uni_name); } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_delete_val(const char *desc, REG_Q_DELETE_VALUE *q_u, - prs_struct *ps, int depth) +BOOL reg_io_q_delete_val(const char *desc, REG_Q_DELETE_VALUE *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_delete_val"); @@ -336,10 +417,12 @@ BOOL reg_io_q_delete_val(const char *desc, REG_Q_DELETE_VALUE *q_u, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pnt_pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth)) return False; - if(!prs_unistr4("name", ps, depth, &q_u->name)) + if(!smb_io_unihdr ("", &r_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; @@ -352,10 +435,9 @@ BOOL reg_io_q_delete_val(const char *desc, REG_Q_DELETE_VALUE *q_u, reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_delete_val(const char *desc, REG_R_DELETE_VALUE *r_u, - prs_struct *ps, int depth) +BOOL reg_io_r_delete_val(const char *desc, REG_R_DELETE_VALUE *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_delete_val"); @@ -364,7 +446,7 @@ BOOL reg_io_r_delete_val(const char *desc, REG_R_DELETE_VALUE *r_u, if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -375,23 +457,23 @@ BOOL reg_io_r_delete_val(const char *desc, REG_R_DELETE_VALUE *r_u, ********************************************************************/ void init_reg_q_delete_key(REG_Q_DELETE_KEY *q_c, POLICY_HND *hnd, - char *name) + char *name) { ZERO_STRUCTP(q_c); memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol)); - init_unistr4(&q_c->name, name, UNI_STR_TERMINATE); + init_unistr2(&q_c->uni_name, name, UNI_STR_TERMINATE); + init_uni_hdr(&q_c->hdr_name, &q_c->uni_name); } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_delete_key(const char *desc, REG_Q_DELETE_KEY *q_u, - prs_struct *ps, int depth) +BOOL reg_io_q_delete_key(const char *desc, REG_Q_DELETE_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_delete_key"); @@ -400,10 +482,12 @@ BOOL reg_io_q_delete_key(const char *desc, REG_Q_DELETE_KEY *q_u, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pnt_pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth)) return False; - if(!prs_unistr4("", ps, depth, &q_u->name)) + if(!smb_io_unihdr ("", &r_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; @@ -415,9 +499,9 @@ BOOL reg_io_q_delete_key(const char *desc, REG_Q_DELETE_KEY *q_u, reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_delete_key(const char *desc, REG_R_DELETE_KEY *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_delete_key(const char *desc, REG_R_DELETE_KEY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_delete_key"); @@ -426,7 +510,7 @@ BOOL reg_io_r_delete_key(const char *desc, REG_R_DELETE_KEY *r_u, prs_struct *p if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -436,21 +520,21 @@ BOOL reg_io_r_delete_key(const char *desc, REG_R_DELETE_KEY *r_u, prs_struct *p Inits a structure. ********************************************************************/ -void init_reg_q_query_key(REG_Q_QUERY_KEY *q_o, POLICY_HND *hnd, const char *class) +void init_reg_q_query_key(REG_Q_QUERY_KEY *q_o, POLICY_HND *hnd, UNISTR2 *uni2) { ZERO_STRUCTP(q_o); memcpy(&q_o->pol, hnd, sizeof(q_o->pol)); - init_unistr4(&q_o->class, class, UNI_STR_TERMINATE); + init_uni_hdr(&q_o->hdr_class, uni2); } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_query_key(const char *desc, REG_Q_QUERY_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_query_key(const char *desc, REG_Q_QUERY_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_query_key"); @@ -459,9 +543,11 @@ BOOL reg_io_q_query_key(const char *desc, REG_Q_QUERY_KEY *q_u, prs_struct *ps, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; - if(!prs_unistr4("class", ps, depth, &q_u->class)) + if(!smb_io_unihdr ("", &r_q->hdr_class, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_q->uni_class, r_q->hdr_class.buffer, ps, depth)) return False; if(!prs_align(ps)) @@ -475,9 +561,9 @@ BOOL reg_io_q_query_key(const char *desc, REG_Q_QUERY_KEY *q_u, prs_struct *ps, reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_query_key(const char *desc, REG_R_QUERY_KEY *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_query_key(const char *desc, REG_R_QUERY_KEY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_query_key"); @@ -486,30 +572,32 @@ BOOL reg_io_r_query_key(const char *desc, REG_R_QUERY_KEY *r_u, prs_struct *ps, if(!prs_align(ps)) return False; - if(!prs_unistr4("class", ps, depth, &r_u->class)) + if(!smb_io_unihdr ("", &r_r->hdr_class, ps, depth)) + return False; + if(!smb_io_unistr2("", &r_r->uni_class, r_r->hdr_class.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("num_subkeys ", ps, depth, &r_u->num_subkeys)) + if(!prs_uint32("num_subkeys ", ps, depth, &r_r->num_subkeys)) return False; - if(!prs_uint32("max_subkeylen ", ps, depth, &r_u->max_subkeylen)) + if(!prs_uint32("max_subkeylen ", ps, depth, &r_r->max_subkeylen)) return False; - if(!prs_uint32("reserved ", ps, depth, &r_u->reserved)) + if(!prs_uint32("reserved ", ps, depth, &r_r->reserved)) return False; - if(!prs_uint32("num_values ", ps, depth, &r_u->num_values)) + if(!prs_uint32("num_values ", ps, depth, &r_r->num_values)) return False; - if(!prs_uint32("max_valnamelen", ps, depth, &r_u->max_valnamelen)) + if(!prs_uint32("max_valnamelen", ps, depth, &r_r->max_valnamelen)) return False; - if(!prs_uint32("max_valbufsize", ps, depth, &r_u->max_valbufsize)) + if(!prs_uint32("max_valbufsize", ps, depth, &r_r->max_valbufsize)) return False; - if(!prs_uint32("sec_desc ", ps, depth, &r_u->sec_desc)) + if(!prs_uint32("sec_desc ", ps, depth, &r_r->sec_desc)) return False; - if(!smb_io_time("mod_time ", &r_u->mod_time, ps, depth)) + if(!smb_io_time("mod_time ", &r_r->mod_time, ps, depth)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -519,7 +607,7 @@ BOOL reg_io_r_query_key(const char *desc, REG_R_QUERY_KEY *r_u, prs_struct *ps, Inits a structure. ********************************************************************/ -void init_reg_q_getversion(REG_Q_GETVERSION *q_o, POLICY_HND *hnd) +void init_reg_q_unknown_1a(REG_Q_UNKNOWN_1A *q_o, POLICY_HND *hnd) { memcpy(&q_o->pol, hnd, sizeof(q_o->pol)); } @@ -529,18 +617,18 @@ void init_reg_q_getversion(REG_Q_GETVERSION *q_o, POLICY_HND *hnd) reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_getversion(const char *desc, REG_Q_GETVERSION *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_unknown_1a(const char *desc, REG_Q_UNKNOWN_1A *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_q_getversion"); + prs_debug(ps, depth, desc, "reg_io_q_unknown_1a"); depth++; if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; return True; @@ -550,20 +638,20 @@ BOOL reg_io_q_getversion(const char *desc, REG_Q_GETVERSION *q_u, prs_struct *p reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_getversion(const char *desc, REG_R_GETVERSION *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_unknown_1a(const char *desc, REG_R_UNKNOWN_1A *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_getversion"); + prs_debug(ps, depth, desc, "reg_io_r_unknown_1a"); depth++; if(!prs_align(ps)) return False; - if(!prs_uint32("unknown", ps, depth, &r_u->unknown)) + if(!prs_uint32("unknown", ps, depth, &r_r->unknown)) return False; - if(!prs_werror("status" , ps, depth, &r_u->status)) + if(!prs_werror("status" , ps, depth, &r_r->status)) return False; return True; @@ -574,24 +662,26 @@ BOOL reg_io_r_getversion(const char *desc, REG_R_GETVERSION *r_u, prs_struct *p reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_restore_key(const char *desc, REG_Q_RESTORE_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_save_key(const char *desc, REG_Q_SAVE_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_q_restore_key"); + prs_debug(ps, depth, desc, "reg_io_q_save_key"); depth++; if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; - if(!prs_unistr4("filename", ps, depth, &q_u->filename)) + if(!smb_io_unihdr ("hdr_file", &r_q->hdr_file, ps, depth)) + return False; + if(!smb_io_unistr2("uni_file", &r_q->uni_file, r_q->hdr_file.buffer, ps, depth)) return False; - if(!prs_uint32("flags", ps, depth, &q_u->flags)) + if(!prs_uint32("unknown", ps, depth, &r_q->unknown)) return False; return True; @@ -601,48 +691,61 @@ BOOL reg_io_q_restore_key(const char *desc, REG_Q_RESTORE_KEY *q_u, prs_struct reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_restore_key(const char *desc, REG_R_RESTORE_KEY *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_save_key(const char *desc, REG_R_SAVE_KEY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_restore_key"); + prs_debug(ps, depth, desc, "reg_io_r_save_key"); depth++; if(!prs_align(ps)) return False; - if(!prs_werror("status" , ps, depth, &r_u->status)) + if(!prs_werror("status" , ps, depth, &r_r->status)) return False; return True; } /******************************************************************* + Inits a structure. +********************************************************************/ + +void init_reg_q_open_hku(REG_Q_OPEN_HKU *q_o, + uint16 unknown_0, uint32 access_mask) +{ + q_o->ptr = 1; + q_o->unknown_0 = unknown_0; + q_o->unknown_1 = 0x0; /* random - changes */ + q_o->access_mask = access_mask; +} + +/******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_save_key(const char *desc, REG_Q_SAVE_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_open_hku(const char *desc, REG_Q_OPEN_HKU *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_q_save_key"); + prs_debug(ps, depth, desc, "reg_io_q_open_hku"); depth++; if(!prs_align(ps)) return False; - - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) - return False; - - if(!prs_unistr4("filename", ps, depth, &q_u->filename)) - return False; - -#if 0 /* reg_io_sec_attr() */ - if(!prs_uint32("unknown", ps, depth, &q_u->unknown)) + + if(!prs_uint32("ptr ", ps, depth, &r_q->ptr)) return False; -#endif + if (r_q->ptr != 0) { + if(!prs_uint16("unknown_0 ", ps, depth, &r_q->unknown_0)) + return False; + if(!prs_uint16("unknown_1 ", ps, depth, &r_q->unknown_1)) + return False; + if(!prs_uint32("access_mask ", ps, depth, &r_q->access_mask)) + return False; + } return True; } @@ -651,18 +754,21 @@ BOOL reg_io_q_save_key(const char *desc, REG_Q_SAVE_KEY *q_u, prs_struct *ps, i reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_save_key(const char *desc, REG_R_SAVE_KEY *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_open_hku(const char *desc, REG_R_OPEN_HKU *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_save_key"); + prs_debug(ps, depth, desc, "reg_io_r_open_hku"); depth++; if(!prs_align(ps)) return False; - if(!prs_werror("status" , ps, depth, &r_u->status)) + if(!smb_io_pol_hnd("", &r_r->pol, ps, depth)) + return False; + + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -708,7 +814,7 @@ reads or writes a structure. BOOL reg_io_r_close(const char *desc, REG_R_CLOSE *r_u, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_u == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_close"); @@ -732,25 +838,24 @@ BOOL reg_io_r_close(const char *desc, REG_R_CLOSE *r_u, prs_struct *ps, int dep makes a structure. ********************************************************************/ -void init_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_u, POLICY_HND *pol, - uint32 sec_info, SEC_DESC_BUF *sec_desc_buf) +void init_reg_q_set_key_sec(REG_Q_SET_KEY_SEC *q_i, POLICY_HND *pol, SEC_DESC_BUF *sec_desc_buf) { - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + memcpy(&q_i->pol, pol, sizeof(q_i->pol)); - q_u->sec_info = sec_info; + q_i->sec_info = DACL_SECURITY_INFORMATION; - q_u->ptr = 1; - init_buf_hdr(&q_u->hdr_sec, sec_desc_buf->len, sec_desc_buf->len); - q_u->data = sec_desc_buf; + q_i->ptr = 1; + init_buf_hdr(&q_i->hdr_sec, sec_desc_buf->len, sec_desc_buf->len); + q_i->data = sec_desc_buf; } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_set_key_sec(const char *desc, REG_Q_SET_KEY_SEC *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_set_key_sec(const char *desc, REG_Q_SET_KEY_SEC *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_set_key_sec"); @@ -759,15 +864,15 @@ BOOL reg_io_q_set_key_sec(const char *desc, REG_Q_SET_KEY_SEC *q_u, prs_struct if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; - if(!prs_uint32("sec_info", ps, depth, &q_u->sec_info)) + if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info)) return False; - if(!prs_uint32("ptr ", ps, depth, &q_u->ptr)) + if(!prs_uint32("ptr ", ps, depth, &r_q->ptr)) return False; - if(!reg_io_hdrbuf_sec(q_u->ptr, NULL, &q_u->hdr_sec, q_u->data, ps, depth)) + if(!reg_io_hdrbuf_sec(r_q->ptr, NULL, &r_q->hdr_sec, r_q->data, ps, depth)) return False; return True; @@ -777,9 +882,9 @@ BOOL reg_io_q_set_key_sec(const char *desc, REG_Q_SET_KEY_SEC *q_u, prs_struct reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_set_key_sec(const char *desc, REG_R_SET_KEY_SEC *q_u, prs_struct *ps, int depth) +BOOL reg_io_r_set_key_sec(const char *desc, REG_R_SET_KEY_SEC *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_set_key_sec"); @@ -788,7 +893,7 @@ BOOL reg_io_r_set_key_sec(const char *desc, REG_R_SET_KEY_SEC *q_u, prs_struct * if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &q_u->status)) + if(!prs_werror("status", ps, depth, &r_q->status)) return False; return True; @@ -799,27 +904,28 @@ BOOL reg_io_r_set_key_sec(const char *desc, REG_R_SET_KEY_SEC *q_u, prs_struct * makes a structure. ********************************************************************/ -void init_reg_q_get_key_sec(REG_Q_GET_KEY_SEC *q_u, POLICY_HND *pol, - uint32 sec_info, uint32 sec_buf_size, - SEC_DESC_BUF *psdb) +void init_reg_q_get_key_sec(REG_Q_GET_KEY_SEC *q_i, POLICY_HND *pol, + uint32 sec_buf_size, SEC_DESC_BUF *psdb) { - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + memcpy(&q_i->pol, pol, sizeof(q_i->pol)); - q_u->sec_info = sec_info; + q_i->sec_info = OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION; - q_u->ptr = psdb != NULL ? 1 : 0; - q_u->data = psdb; + q_i->ptr = psdb != NULL ? 1 : 0; + q_i->data = psdb; - init_buf_hdr(&q_u->hdr_sec, sec_buf_size, 0); + init_buf_hdr(&q_i->hdr_sec, sec_buf_size, 0); } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_get_key_sec(const char *desc, REG_Q_GET_KEY_SEC *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_get_key_sec(const char *desc, REG_Q_GET_KEY_SEC *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_get_key_sec"); @@ -828,15 +934,15 @@ BOOL reg_io_q_get_key_sec(const char *desc, REG_Q_GET_KEY_SEC *q_u, prs_struct if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) return False; - if(!prs_uint32("sec_info", ps, depth, &q_u->sec_info)) + if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info)) return False; - if(!prs_uint32("ptr ", ps, depth, &q_u->ptr)) + if(!prs_uint32("ptr ", ps, depth, &r_q->ptr)) return False; - if(!reg_io_hdrbuf_sec(q_u->ptr, NULL, &q_u->hdr_sec, q_u->data, ps, depth)) + if(!reg_io_hdrbuf_sec(r_q->ptr, NULL, &r_q->hdr_sec, r_q->data, ps, depth)) return False; return True; @@ -862,9 +968,9 @@ makes a structure. reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_get_key_sec(const char *desc, REG_R_GET_KEY_SEC *q_u, prs_struct *ps, int depth) +BOOL reg_io_r_get_key_sec(const char *desc, REG_R_GET_KEY_SEC *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_get_key_sec"); @@ -873,19 +979,19 @@ BOOL reg_io_r_get_key_sec(const char *desc, REG_R_GET_KEY_SEC *q_u, prs_struct if(!prs_align(ps)) return False; - if(!prs_uint32("ptr ", ps, depth, &q_u->ptr)) + if(!prs_uint32("ptr ", ps, depth, &r_q->ptr)) return False; - if (q_u->ptr != 0) { - if(!smb_io_hdrbuf("", &q_u->hdr_sec, ps, depth)) + if (r_q->ptr != 0) { + if(!smb_io_hdrbuf("", &r_q->hdr_sec, ps, depth)) return False; - if(!sec_io_desc_buf("", &q_u->data, ps, depth)) + if(!sec_io_desc_buf("", &r_q->data, ps, depth)) return False; if(!prs_align(ps)) return False; } - if(!prs_werror("status", ps, depth, &q_u->status)) + if(!prs_werror("status", ps, depth, &r_q->status)) return False; return True; @@ -895,29 +1001,29 @@ BOOL reg_io_r_get_key_sec(const char *desc, REG_R_GET_KEY_SEC *q_u, prs_struct makes a structure. ********************************************************************/ -BOOL init_reg_q_info(REG_Q_INFO *q_u, POLICY_HND *pol, const char *val_name, - REGVAL_BUFFER *value_output) +BOOL init_reg_q_info(REG_Q_INFO *q_i, POLICY_HND *pol, char* val_name) { - if (q_u == NULL) + if (q_i == NULL) return False; - q_u->pol = *pol; + q_i->pol = *pol; - init_unistr4(&q_u->name, val_name, UNI_STR_TERMINATE); + init_unistr2(&q_i->uni_type, val_name, UNI_STR_TERMINATE); + init_uni_hdr(&q_i->hdr_type, &q_i->uni_type); - q_u->ptr_reserved = 1; - q_u->ptr_buf = 1; + q_i->ptr_reserved = 1; + q_i->ptr_buf = 1; - q_u->ptr_bufsize = 1; - q_u->bufsize = value_output->buf_max_len; - q_u->buf_unk = 0; + q_i->ptr_bufsize = 1; + q_i->bufsize = 0; + q_i->buf_unk = 0; - q_u->unk1 = 0; - q_u->ptr_buflen = 1; - q_u->buflen = value_output->buf_max_len; + q_i->unk1 = 0; + q_i->ptr_buflen = 1; + q_i->buflen = 0; - q_u->ptr_buflen2 = 1; - q_u->buflen2 = 0; + q_i->ptr_buflen2 = 1; + q_i->buflen2 = 0; return True; } @@ -926,9 +1032,9 @@ BOOL init_reg_q_info(REG_Q_INFO *q_u, POLICY_HND *pol, const char *val_name, reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_info(const char *desc, REG_Q_INFO *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_info(const char *desc, REG_Q_INFO *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_info"); @@ -937,41 +1043,43 @@ BOOL reg_io_q_info(const char *desc, REG_Q_INFO *q_u, prs_struct *ps, int depth if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) + return False; + if(!smb_io_unihdr ("", &r_q->hdr_type, ps, depth)) return False; - if(!prs_unistr4("name", ps, depth, &q_u->name)) + if(!smb_io_unistr2("", &r_q->uni_type, r_q->hdr_type.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("ptr_reserved", ps, depth, &(q_u->ptr_reserved))) + if(!prs_uint32("ptr_reserved", ps, depth, &(r_q->ptr_reserved))) return False; - if(!prs_uint32("ptr_buf", ps, depth, &(q_u->ptr_buf))) + if(!prs_uint32("ptr_buf", ps, depth, &(r_q->ptr_buf))) return False; - if(q_u->ptr_buf) { - if(!prs_uint32("ptr_bufsize", ps, depth, &(q_u->ptr_bufsize))) + if(r_q->ptr_buf) { + if(!prs_uint32("ptr_bufsize", ps, depth, &(r_q->ptr_bufsize))) return False; - if(!prs_uint32("bufsize", ps, depth, &(q_u->bufsize))) + if(!prs_uint32("bufsize", ps, depth, &(r_q->bufsize))) return False; - if(!prs_uint32("buf_unk", ps, depth, &(q_u->buf_unk))) + if(!prs_uint32("buf_unk", ps, depth, &(r_q->buf_unk))) return False; } - if(!prs_uint32("unk1", ps, depth, &(q_u->unk1))) + if(!prs_uint32("unk1", ps, depth, &(r_q->unk1))) return False; - if(!prs_uint32("ptr_buflen", ps, depth, &(q_u->ptr_buflen))) + if(!prs_uint32("ptr_buflen", ps, depth, &(r_q->ptr_buflen))) return False; - if (q_u->ptr_buflen) { - if(!prs_uint32("buflen", ps, depth, &(q_u->buflen))) + if (r_q->ptr_buflen) { + if(!prs_uint32("buflen", ps, depth, &(r_q->buflen))) return False; - if(!prs_uint32("ptr_buflen2", ps, depth, &(q_u->ptr_buflen2))) + if(!prs_uint32("ptr_buflen2", ps, depth, &(r_q->ptr_buflen2))) return False; - if(!prs_uint32("buflen2", ps, depth, &(q_u->buflen2))) + if(!prs_uint32("buflen2", ps, depth, &(r_q->buflen2))) return False; } @@ -983,36 +1091,72 @@ BOOL reg_io_q_info(const char *desc, REG_Q_INFO *q_u, prs_struct *ps, int depth New version to replace older init_reg_r_info() ********************************************************************/ -BOOL init_reg_r_info(uint32 include_keyval, REG_R_INFO *r_u, +BOOL new_init_reg_r_info(uint32 include_keyval, REG_R_INFO *r_r, REGISTRY_VALUE *val, WERROR status) { - uint32 buf_len = 0; - REGVAL_BUFFER buf2; + uint32 buf_len = 0; + BUFFER2 buf2; - if( !r_u || !val ) + if(r_r == NULL) return False; - r_u->type = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->type = val->type; - - buf_len = reg_init_regval_buffer( &buf2, val ); - - r_u->buf_max_len = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->buf_max_len = buf_len; + if ( !val ) + return False; + + r_r->ptr_type = 1; + r_r->type = val->type; - r_u->buf_len = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->buf_len = buf_len; - /* if include_keyval is not set, don't send the key value, just the buflen data. probably used by NT5 to allocate buffer space - SK */ if ( include_keyval ) { - r_u->value = TALLOC_P( get_talloc_ctx(), REGVAL_BUFFER ); - /* steal the memory */ - *r_u->value = buf2; + r_r->ptr_uni_val = 1; + buf_len = reg_init_buffer2( &r_r->uni_val, val ); + + } + else { + /* dummy buffer used so we can get the size */ + r_r->ptr_uni_val = 0; + buf_len = reg_init_buffer2( &buf2, val ); } - r_u->status = status; + r_r->ptr_max_len = 1; + r_r->buf_max_len = buf_len; + + r_r->ptr_len = 1; + r_r->buf_len = buf_len; + + r_r->status = status; + + return True; +} + +/******************************************************************* + Inits a structure. +********************************************************************/ + +BOOL init_reg_r_info(uint32 include_keyval, REG_R_INFO *r_r, + BUFFER2* buf, uint32 type, WERROR status) +{ + if(r_r == NULL) + return False; + + r_r->ptr_type = 1; + r_r->type = type; + + /* if include_keyval is not set, don't send the key value, just + the buflen data. probably used by NT5 to allocate buffer space - SK */ + + r_r->ptr_uni_val = include_keyval ? 1:0; + r_r->uni_val = *buf; + + r_r->ptr_max_len = 1; + r_r->buf_max_len = r_r->uni_val.buf_max_len; + + r_r->ptr_len = 1; + r_r->buf_len = r_r->uni_val.buf_len; + + r_r->status = status; return True; } @@ -1021,9 +1165,9 @@ BOOL init_reg_r_info(uint32 include_keyval, REG_R_INFO *r_u, reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_info(const char *desc, REG_R_INFO *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_info(const char *desc, REG_R_INFO *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_info"); @@ -1032,20 +1176,41 @@ BOOL reg_io_r_info(const char *desc, REG_R_INFO *r_u, prs_struct *ps, int depth) if(!prs_align(ps)) return False; - if ( !prs_pointer("type", ps, depth, (void**)&r_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr_type", ps, depth, &(r_r->ptr_type))) return False; - if ( !prs_pointer("value", ps, depth, (void**)&r_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer)) + if (r_r->ptr_type != 0) { + if(!prs_uint32("type", ps, depth, &r_r->type)) + return False; + } + + if(!prs_uint32("ptr_uni_val", ps, depth, &(r_r->ptr_uni_val))) return False; + + if(r_r->ptr_uni_val != 0) { + if(!smb_io_buffer2("uni_val", &r_r->uni_val, r_r->ptr_uni_val, ps, depth)) + return False; + } + if(!prs_align(ps)) return False; - if ( !prs_pointer("buf_max_len", ps, depth, (void**)&r_u->buf_max_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr_max_len", ps, depth, &(r_r->ptr_max_len))) return False; - if ( !prs_pointer("buf_len", ps, depth, (void**)&r_u->buf_len, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + + if (r_r->ptr_max_len != 0) { + if(!prs_uint32("buf_max_len", ps, depth, &(r_r->buf_max_len))) return False; + } - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_uint32("ptr_len", ps, depth, &(r_r->ptr_len))) + return False; + if (r_r->ptr_len != 0) { + if(!prs_uint32("buf_len", ps, depth, &(r_r->buf_len))) + return False; + } + + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -1055,29 +1220,28 @@ BOOL reg_io_r_info(const char *desc, REG_R_INFO *r_u, prs_struct *ps, int depth) makes a structure. ********************************************************************/ -void init_reg_q_enum_val(REG_Q_ENUM_VALUE *q_u, POLICY_HND *pol, - uint32 val_idx, char *name, +void init_reg_q_enum_val(REG_Q_ENUM_VALUE *q_i, POLICY_HND *pol, + uint32 val_idx, UNISTR2 *uni2, uint32 max_buf_len) { - ZERO_STRUCTP(q_u); - - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + ZERO_STRUCTP(q_i); - q_u->val_index = val_idx; + memcpy(&q_i->pol, pol, sizeof(q_i->pol)); - init_unistr4( &q_u->name, name, UNI_STR_TERMINATE ); + q_i->val_index = val_idx; + init_uni_hdr(&q_i->hdr_name, uni2); - q_u->type = TALLOC_P( get_talloc_ctx(), uint32 ); - *q_u->type = 0x0; + q_i->ptr_type = 1; + q_i->type = 0x0; - q_u->value = TALLOC_P( get_talloc_ctx(), REGVAL_BUFFER ); - q_u->value->buf_max_len = max_buf_len; + q_i->ptr_value = 1; + q_i->buf_value.buf_max_len = max_buf_len; - q_u->len_value1 = TALLOC_P( get_talloc_ctx(), uint32 ); - *q_u->len_value1 = max_buf_len; + q_i->ptr1 = 1; + q_i->len_value1 = max_buf_len; - q_u->len_value2 = TALLOC_P( get_talloc_ctx(), uint32 ); - *q_u->len_value2 = max_buf_len; + q_i->ptr2 = 1; + q_i->len_value2 = 0; } /******************************************************************* @@ -1096,25 +1260,26 @@ void init_reg_r_enum_val(REG_R_ENUM_VALUE *r_u, REGISTRY_VALUE *val ) DEBUG(10,("init_reg_r_enum_val: Valuename => [%s]\n", val->valuename)); - init_unistr4( &r_u->name, val->valuename, UNI_STR_TERMINATE); + init_unistr2( &r_u->uni_name, val->valuename, UNI_STR_TERMINATE); + init_uni_hdr( &r_u->hdr_name, &r_u->uni_name); /* type */ - r_u->type = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->type = val->type; + r_u->ptr_type = 1; + r_u->type = val->type; /* REG_SZ & REG_MULTI_SZ must be converted to UNICODE */ - r_u->value = TALLOC_P( get_talloc_ctx(), REGVAL_BUFFER ); - real_size = reg_init_regval_buffer( r_u->value, val ); + r_u->ptr_value = 1; + real_size = reg_init_buffer2( &r_u->buf_value, val ); /* lengths */ - r_u->len_value1 = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->len_value1 = real_size; + r_u->ptr1 = 1; + r_u->len_value1 = real_size; - r_u->len_value2 = TALLOC_P( get_talloc_ctx(), uint32 ); - *r_u->len_value2 = real_size; + r_u->ptr2 = 1; + r_u->len_value2 = real_size; DEBUG(8,("init_reg_r_enum_val: Exit\n")); } @@ -1123,9 +1288,9 @@ void init_reg_r_enum_val(REG_R_ENUM_VALUE *r_u, REGISTRY_VALUE *val ) reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_enum_val(const char *desc, REG_Q_ENUM_VALUE *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_enum_val(const char *desc, REG_Q_ENUM_VALUE *q_q, prs_struct *ps, int depth) { - if (q_u == NULL) + if (q_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_enum_val"); @@ -1134,29 +1299,46 @@ BOOL reg_io_q_enum_val(const char *desc, REG_Q_ENUM_VALUE *q_u, prs_struct *ps, if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &q_q->pol, ps, depth)) return False; - if(!prs_uint32("val_index", ps, depth, &q_u->val_index)) + if(!prs_uint32("val_index", ps, depth, &q_q->val_index)) return False; - if(!prs_unistr4("name", ps, depth, &q_u->name )) + if(!smb_io_unihdr ("hdr_name", &q_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("uni_name", &q_q->uni_name, q_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_pointer("type", ps, depth, (void**)&q_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr_type", ps, depth, &q_q->ptr_type)) return False; - if ( !prs_pointer("value", ps, depth, (void**)&q_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer)) + if (q_q->ptr_type != 0) { + if(!prs_uint32("type", ps, depth, &q_q->type)) + return False; + } + + if(!prs_uint32("ptr_value", ps, depth, &q_q->ptr_value)) + return False; + if(!smb_io_buffer2("buf_value", &q_q->buf_value, q_q->ptr_value, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_pointer("len_value1", ps, depth, (void**)&q_u->len_value1, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr1", ps, depth, &q_q->ptr1)) return False; - if(!prs_pointer("len_value2", ps, depth, (void**)&q_u->len_value2, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if (q_q->ptr1 != 0) { + if(!prs_uint32("len_value1", ps, depth, &q_q->len_value1)) + return False; + } + if(!prs_uint32("ptr2", ps, depth, &q_q->ptr2)) return False; + if (q_q->ptr2 != 0) { + if(!prs_uint32("len_value2", ps, depth, &q_q->len_value2)) + return False; + } return True; } @@ -1165,9 +1347,9 @@ BOOL reg_io_q_enum_val(const char *desc, REG_Q_ENUM_VALUE *q_u, prs_struct *ps, reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_enum_val(const char *desc, REG_R_ENUM_VALUE *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_enum_val(const char *desc, REG_R_ENUM_VALUE *r_q, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_enum_val"); @@ -1176,26 +1358,43 @@ BOOL reg_io_r_enum_val(const char *desc, REG_R_ENUM_VALUE *r_u, prs_struct *ps, if(!prs_align(ps)) return False; - if(!prs_unistr4("name", ps, depth, &r_u->name )) + if(!smb_io_unihdr ("hdr_name", &r_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("uni_name", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_pointer("type", ps, depth, (void**)&r_u->type, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr_type", ps, depth, &r_q->ptr_type)) return False; - if ( !prs_pointer("value", ps, depth, (void**)&r_u->value, sizeof(REGVAL_BUFFER), (PRS_POINTER_CAST)smb_io_regval_buffer)) + if (r_q->ptr_type != 0) { + if(!prs_uint32("type", ps, depth, &r_q->type)) + return False; + } + + if(!prs_uint32("ptr_value", ps, depth, &r_q->ptr_value)) + return False; + if(!smb_io_buffer2("buf_value", &r_q->buf_value, r_q->ptr_value, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_pointer("len_value1", ps, depth, (void**)&r_u->len_value1, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) - return False; - if(!prs_pointer("len_value2", ps, depth, (void**)&r_u->len_value2, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32)) + if(!prs_uint32("ptr1", ps, depth, &r_q->ptr1)) return False; + if (r_q->ptr1 != 0) { + if(!prs_uint32("len_value1", ps, depth, &r_q->len_value1)) + return False; + } + if(!prs_uint32("ptr2", ps, depth, &r_q->ptr2)) + return False; + if (r_q->ptr2 != 0) { + if(!prs_uint32("len_value2", ps, depth, &r_q->len_value2)) + return False; + } - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_q->status)) return False; return True; @@ -1205,55 +1404,53 @@ BOOL reg_io_r_enum_val(const char *desc, REG_R_ENUM_VALUE *r_u, prs_struct *ps, makes a structure. ********************************************************************/ -void init_reg_q_set_val(REG_Q_SET_VALUE *q_u, POLICY_HND *pol, +void init_reg_q_create_val(REG_Q_CREATE_VALUE *q_i, POLICY_HND *pol, char *val_name, uint32 type, - RPC_DATA_BLOB *val) + BUFFER3 *val) { - ZERO_STRUCTP(q_u); + ZERO_STRUCTP(q_i); - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + memcpy(&q_i->pol, pol, sizeof(q_i->pol)); - init_unistr4(&q_u->name, val_name, UNI_STR_TERMINATE); + init_unistr2(&q_i->uni_name, val_name, UNI_STR_TERMINATE); + init_uni_hdr(&q_i->hdr_name, &q_i->uni_name); - q_u->type = type; - q_u->value = *val; - q_u->size = val->buf_len; + q_i->type = type; + q_i->buf_value = val; } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_set_val(const char *desc, REG_Q_SET_VALUE *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_create_val(const char *desc, REG_Q_CREATE_VALUE *q_q, prs_struct *ps, int depth) { - if (q_u == NULL) + if (q_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_q_set_val"); + prs_debug(ps, depth, desc, "reg_io_q_create_val"); depth++; if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &q_q->pol, ps, depth)) return False; - if(!prs_unistr4("name", ps, depth, &q_u->name )) + if(!smb_io_unihdr ("hdr_name", &q_q->hdr_name, ps, depth)) + return False; + if(!smb_io_unistr2("uni_name", &q_q->uni_name, q_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("type", ps, depth, &q_u->type)) + if(!prs_uint32("type", ps, depth, &q_q->type)) return False; - - if(!smb_io_rpc_blob("value", &q_u->value, ps, depth )) + if(!smb_io_buffer3("buf_value", q_q->buf_value, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("size", ps, depth, &q_u->size)) - return False; - return True; } @@ -1261,18 +1458,18 @@ BOOL reg_io_q_set_val(const char *desc, REG_Q_SET_VALUE *q_u, prs_struct *ps, i reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_set_val(const char *desc, REG_R_SET_VALUE *q_u, prs_struct *ps, int depth) +BOOL reg_io_r_create_val(const char *desc, REG_R_CREATE_VALUE *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_set_val"); + prs_debug(ps, depth, desc, "reg_io_r_create_val"); depth++; if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &q_u->status)) + if(!prs_werror("status", ps, depth, &r_q->status)) return False; return True; @@ -1282,23 +1479,23 @@ BOOL reg_io_r_set_val(const char *desc, REG_R_SET_VALUE *q_u, prs_struct *ps, i makes a structure. ********************************************************************/ -void init_reg_q_enum_key(REG_Q_ENUM_KEY *q_u, POLICY_HND *pol, uint32 key_idx) +void init_reg_q_enum_key(REG_Q_ENUM_KEY *q_i, POLICY_HND *pol, uint32 key_idx) { - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + memcpy(&q_i->pol, pol, sizeof(q_i->pol)); - q_u->key_index = key_idx; - q_u->key_name_len = 0; - q_u->unknown_1 = 0x0414; + q_i->key_index = key_idx; + q_i->key_name_len = 0; + q_i->unknown_1 = 0x0414; - q_u->ptr1 = 1; - q_u->unknown_2 = 0x0000020A; - memset(q_u->pad1, 0, sizeof(q_u->pad1)); + q_i->ptr1 = 1; + q_i->unknown_2 = 0x0000020A; + memset(q_i->pad1, 0, sizeof(q_i->pad1)); - q_u->ptr2 = 1; - memset(q_u->pad2, 0, sizeof(q_u->pad2)); + q_i->ptr2 = 1; + memset(q_i->pad2, 0, sizeof(q_i->pad2)); - q_u->ptr3 = 1; - unix_to_nt_time(&q_u->time, 0); /* current time? */ + q_i->ptr3 = 1; + unix_to_nt_time(&q_i->time, 0); /* current time? */ } /******************************************************************* @@ -1328,9 +1525,9 @@ void init_reg_r_enum_key(REG_R_ENUM_KEY *r_u, char *subkey, uint32 unknown_1, reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_enum_key(const char *desc, REG_Q_ENUM_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_enum_key(const char *desc, REG_Q_ENUM_KEY *q_q, prs_struct *ps, int depth) { - if (q_u == NULL) + if (q_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_enum_key"); @@ -1339,39 +1536,39 @@ BOOL reg_io_q_enum_key(const char *desc, REG_Q_ENUM_KEY *q_u, prs_struct *ps, i if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &q_q->pol, ps, depth)) return False; - if(!prs_uint32("key_index", ps, depth, &q_u->key_index)) + if(!prs_uint32("key_index", ps, depth, &q_q->key_index)) return False; - if(!prs_uint16("key_name_len", ps, depth, &q_u->key_name_len)) + if(!prs_uint16("key_name_len", ps, depth, &q_q->key_name_len)) return False; - if(!prs_uint16("unknown_1", ps, depth, &q_u->unknown_1)) + if(!prs_uint16("unknown_1", ps, depth, &q_q->unknown_1)) return False; - if(!prs_uint32("ptr1", ps, depth, &q_u->ptr1)) + if(!prs_uint32("ptr1", ps, depth, &q_q->ptr1)) return False; - if (q_u->ptr1 != 0) { - if(!prs_uint32("unknown_2", ps, depth, &q_u->unknown_2)) + if (q_q->ptr1 != 0) { + if(!prs_uint32("unknown_2", ps, depth, &q_q->unknown_2)) return False; - if(!prs_uint8s(False, "pad1", ps, depth, q_u->pad1, sizeof(q_u->pad1))) + if(!prs_uint8s(False, "pad1", ps, depth, q_q->pad1, sizeof(q_q->pad1))) return False; } - if(!prs_uint32("ptr2", ps, depth, &q_u->ptr2)) + if(!prs_uint32("ptr2", ps, depth, &q_q->ptr2)) return False; - if (q_u->ptr2 != 0) { - if(!prs_uint8s(False, "pad2", ps, depth, q_u->pad2, sizeof(q_u->pad2))) + if (q_q->ptr2 != 0) { + if(!prs_uint8s(False, "pad2", ps, depth, q_q->pad2, sizeof(q_q->pad2))) return False; } - if(!prs_uint32("ptr3", ps, depth, &q_u->ptr3)) + if(!prs_uint32("ptr3", ps, depth, &q_q->ptr3)) return False; - if (q_u->ptr3 != 0) { - if(!smb_io_time("", &q_u->time, ps, depth)) + if (q_q->ptr3 != 0) { + if(!smb_io_time("", &q_q->time, ps, depth)) return False; } @@ -1382,9 +1579,9 @@ BOOL reg_io_q_enum_key(const char *desc, REG_Q_ENUM_KEY *q_u, prs_struct *ps, i reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_enum_key(const char *desc, REG_R_ENUM_KEY *q_u, prs_struct *ps, int depth) +BOOL reg_io_r_enum_key(const char *desc, REG_R_ENUM_KEY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_enum_key"); @@ -1393,42 +1590,42 @@ BOOL reg_io_r_enum_key(const char *desc, REG_R_ENUM_KEY *q_u, prs_struct *ps, i if(!prs_align(ps)) return False; - if(!prs_uint16("key_name_len", ps, depth, &q_u->key_name_len)) + if(!prs_uint16("key_name_len", ps, depth, &r_q->key_name_len)) return False; - if(!prs_uint16("unknown_1", ps, depth, &q_u->unknown_1)) + if(!prs_uint16("unknown_1", ps, depth, &r_q->unknown_1)) return False; - if(!prs_uint32("ptr1", ps, depth, &q_u->ptr1)) + if(!prs_uint32("ptr1", ps, depth, &r_q->ptr1)) return False; - if (q_u->ptr1 != 0) { - if(!prs_uint32("unknown_2", ps, depth, &q_u->unknown_2)) + if (r_q->ptr1 != 0) { + if(!prs_uint32("unknown_2", ps, depth, &r_q->unknown_2)) return False; - if(!prs_uint32("unknown_3", ps, depth, &q_u->unknown_3)) + if(!prs_uint32("unknown_3", ps, depth, &r_q->unknown_3)) return False; - if(!smb_io_unistr3("key_name", &q_u->key_name, ps, depth)) + if(!smb_io_unistr3("key_name", &r_q->key_name, ps, depth)) return False; if(!prs_align(ps)) return False; } - if(!prs_uint32("ptr2", ps, depth, &q_u->ptr2)) + if(!prs_uint32("ptr2", ps, depth, &r_q->ptr2)) return False; - if (q_u->ptr2 != 0) { - if(!prs_uint8s(False, "pad2", ps, depth, q_u->pad2, sizeof(q_u->pad2))) + if (r_q->ptr2 != 0) { + if(!prs_uint8s(False, "pad2", ps, depth, r_q->pad2, sizeof(r_q->pad2))) return False; } - if(!prs_uint32("ptr3", ps, depth, &q_u->ptr3)) + if(!prs_uint32("ptr3", ps, depth, &r_q->ptr3)) return False; - if (q_u->ptr3 != 0) { - if(!smb_io_time("", &q_u->time, ps, depth)) + if (r_q->ptr3 != 0) { + if(!smb_io_time("", &r_q->time, ps, depth)) return False; } - if(!prs_werror("status", ps, depth, &q_u->status)) + if(!prs_werror("status", ps, depth, &r_q->status)) return False; return True; @@ -1438,43 +1635,46 @@ BOOL reg_io_r_enum_key(const char *desc, REG_R_ENUM_KEY *q_u, prs_struct *ps, i makes a structure. ********************************************************************/ -void init_reg_q_open_entry(REG_Q_OPEN_ENTRY *q_u, POLICY_HND *pol, +void init_reg_q_open_entry(REG_Q_OPEN_ENTRY *r_q, POLICY_HND *pol, char *key_name, uint32 access_desired) { - memcpy(&q_u->pol, pol, sizeof(q_u->pol)); + memcpy(&r_q->pol, pol, sizeof(r_q->pol)); - init_unistr4(&q_u->name, key_name, UNI_STR_TERMINATE); + init_unistr2(&r_q->uni_name, key_name, UNI_STR_TERMINATE); + init_uni_hdr(&r_q->hdr_name, &r_q->uni_name); - q_u->unknown_0 = 0x00000000; - q_u->access = access_desired; + r_q->unknown_0 = 0x00000000; + r_q->access_desired = access_desired; } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_open_entry(const char *desc, REG_Q_OPEN_ENTRY *q_u, prs_struct *ps, int depth) +BOOL reg_io_q_open_entry(const char *desc, REG_Q_OPEN_ENTRY *r_q, prs_struct *ps, int depth) { - if ( !q_u ) + if (r_q == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_q_open_entry"); + prs_debug(ps, depth, desc, "reg_io_q_entry"); depth++; if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &q_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_q->pol, ps, depth)) + return False; + if(!smb_io_unihdr ("", &r_q->hdr_name, ps, depth)) return False; - if(!prs_unistr4("name", ps, depth, &q_u->name)) + if(!smb_io_unistr2("", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth)) return False; if(!prs_align(ps)) return False; - if(!prs_uint32("unknown_0 ", ps, depth, &q_u->unknown_0)) + if(!prs_uint32("unknown_0 ", ps, depth, &r_q->unknown_0)) return False; - if(!prs_uint32("access", ps, depth, &q_u->access)) + if(!prs_uint32("access_desired ", ps, depth, &r_q->access_desired)) return False; return True; @@ -1484,24 +1684,24 @@ BOOL reg_io_q_open_entry(const char *desc, REG_Q_OPEN_ENTRY *q_u, prs_struct *p Inits a structure. ********************************************************************/ -void init_reg_r_open_entry(REG_R_OPEN_ENTRY *r_u, +void init_reg_r_open_entry(REG_R_OPEN_ENTRY *r_r, POLICY_HND *pol, WERROR werr) { if (W_ERROR_IS_OK(werr)) { - memcpy(&r_u->pol, pol, sizeof(r_u->pol)); + memcpy(&r_r->pol, pol, sizeof(r_r->pol)); } else { - ZERO_STRUCT(r_u->pol); + ZERO_STRUCT(r_r->pol); } - r_u->status = werr; + r_r->status = werr; } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_open_entry(const char *desc, REG_R_OPEN_ENTRY *r_u, prs_struct *ps, int depth) +BOOL reg_io_r_open_entry(const char *desc, REG_R_OPEN_ENTRY *r_r, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_r == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_open_entry"); @@ -1510,10 +1710,10 @@ BOOL reg_io_r_open_entry(const char *desc, REG_R_OPEN_ENTRY *r_u, prs_struct *p if(!prs_align(ps)) return False; - if(!smb_io_pol_hnd("", &r_u->pol, ps, depth)) + if(!smb_io_pol_hnd("", &r_r->pol, ps, depth)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_r->status)) return False; return True; @@ -1523,53 +1723,30 @@ BOOL reg_io_r_open_entry(const char *desc, REG_R_OPEN_ENTRY *r_u, prs_struct *p Inits a structure. ********************************************************************/ -void init_reg_q_shutdown(REG_Q_SHUTDOWN *q_u, const char *msg, +void init_reg_q_shutdown(REG_Q_SHUTDOWN * q_s, const char *msg, uint32 timeout, BOOL do_reboot, BOOL force) { - q_u->server = TALLOC_P( get_talloc_ctx(), uint16 ); - *q_u->server = 0x1; - - q_u->message = TALLOC_P( get_talloc_ctx(), UNISTR4 ); - init_unistr4( q_u->message, msg, UNI_FLAGS_NONE ); + q_s->ptr_0 = 1; + q_s->ptr_1 = 1; + q_s->ptr_2 = 1; - q_u->timeout = timeout; - - q_u->reboot = do_reboot ? 1 : 0; - q_u->force = force ? 1 : 0; -} + init_unistr2(&q_s->uni_msg, msg, UNI_FLAGS_NONE); + init_uni_hdr(&q_s->hdr_msg, &q_s->uni_msg); -/******************************************************************* -Inits a REG_Q_SHUTDOWN_EX structure. -********************************************************************/ + q_s->timeout = timeout; -void init_reg_q_shutdown_ex(REG_Q_SHUTDOWN_EX * q_u_ex, const char *msg, - uint32 timeout, BOOL do_reboot, BOOL force, uint32 reason) -{ - REG_Q_SHUTDOWN q_u; - - ZERO_STRUCT( q_u ); - - init_reg_q_shutdown( &q_u, msg, timeout, do_reboot, force ); - - /* steal memory */ - - q_u_ex->server = q_u.server; - q_u_ex->message = q_u.message; - - q_u_ex->reboot = q_u.reboot; - q_u_ex->force = q_u.force; - - q_u_ex->reason = reason; + q_s->reboot = do_reboot ? 1 : 0; + q_s->force = force ? 1 : 0; } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_shutdown(const char *desc, REG_Q_SHUTDOWN *q_u, prs_struct *ps, +BOOL reg_io_q_shutdown(const char *desc, REG_Q_SHUTDOWN * q_s, prs_struct *ps, int depth) { - if ( !q_u ) + if (q_s == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_shutdown"); @@ -1578,129 +1755,68 @@ BOOL reg_io_q_shutdown(const char *desc, REG_Q_SHUTDOWN *q_u, prs_struct *ps, if (!prs_align(ps)) return False; - if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) - return False; - - if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) - return False; - - if (!prs_align(ps)) - return False; - - if (!prs_uint32("timeout", ps, depth, &(q_u->timeout))) - return False; - - if (!prs_uint8("force ", ps, depth, &(q_u->force))) + if (!prs_uint32("ptr_0", ps, depth, &(q_s->ptr_0))) return False; - if (!prs_uint8("reboot ", ps, depth, &(q_u->reboot))) + if (!prs_uint32("ptr_1", ps, depth, &(q_s->ptr_1))) return False; - - - return True; -} - -/******************************************************************* -reads or writes a structure. -********************************************************************/ -BOOL reg_io_r_shutdown(const char *desc, REG_R_SHUTDOWN *r_u, prs_struct *ps, - int depth) -{ - if ( !r_u ) + if (!prs_uint32("ptr_2", ps, depth, &(q_s->ptr_2))) return False; - prs_debug(ps, depth, desc, "reg_io_r_shutdown"); - depth++; - - if(!prs_align(ps)) + if (!smb_io_unihdr("hdr_msg", &(q_s->hdr_msg), ps, depth)) return False; - - if(!prs_werror("status", ps, depth, &r_u->status)) + if (!smb_io_unistr2("uni_msg", &(q_s->uni_msg), q_s->hdr_msg.buffer, ps, depth)) return False; - - return True; -} - -/******************************************************************* -reads or writes a REG_Q_SHUTDOWN_EX structure. -********************************************************************/ - -BOOL reg_io_q_shutdown_ex(const char *desc, REG_Q_SHUTDOWN_EX *q_u, prs_struct *ps, - int depth) -{ - if ( !q_u ) - return False; - - prs_debug(ps, depth, desc, "reg_io_q_shutdown_ex"); - depth++; - if (!prs_align(ps)) return False; - if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) + if (!prs_uint32("timeout", ps, depth, &(q_s->timeout))) return False; - - if (!prs_pointer("message", ps, depth, (void**)&q_u->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4)) + if (!prs_uint8("force ", ps, depth, &(q_s->force))) return False; - - if (!prs_align(ps)) - return False; - - if (!prs_uint32("timeout", ps, depth, &(q_u->timeout))) + if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot))) return False; - if (!prs_uint8("force ", ps, depth, &(q_u->force))) - return False; - if (!prs_uint8("reboot ", ps, depth, &(q_u->reboot))) - return False; - - if (!prs_align(ps)) - return False; - if (!prs_uint32("reason", ps, depth, &(q_u->reason))) - return False; - - return True; } /******************************************************************* -reads or writes a REG_R_SHUTDOWN_EX structure. +reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_shutdown_ex(const char *desc, REG_R_SHUTDOWN_EX *r_u, prs_struct *ps, +BOOL reg_io_r_shutdown(const char *desc, REG_R_SHUTDOWN * r_s, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_s == NULL) return False; - prs_debug(ps, depth, desc, "reg_io_r_shutdown_ex"); + prs_debug(ps, depth, desc, "reg_io_r_shutdown"); depth++; if(!prs_align(ps)) return False; - if(!prs_werror("status", ps, depth, &r_u->status)) + if(!prs_werror("status", ps, depth, &r_s->status)) return False; return True; } - - /******************************************************************* Inits a structure. ********************************************************************/ -void init_reg_q_abort_shutdown(REG_Q_ABORT_SHUTDOWN *q_u) +void init_reg_q_abort_shutdown(REG_Q_ABORT_SHUTDOWN * q_s) { - q_u->server = TALLOC_P( get_talloc_ctx(), uint16 ); - *q_u->server = 0x1; + + q_s->ptr_server = 0; + } /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_q_abort_shutdown(const char *desc, REG_Q_ABORT_SHUTDOWN *q_u, +BOOL reg_io_q_abort_shutdown(const char *desc, REG_Q_ABORT_SHUTDOWN * q_s, prs_struct *ps, int depth) { - if ( !q_u ) + if (q_s == NULL) return False; prs_debug(ps, depth, desc, "reg_io_q_abort_shutdown"); @@ -1709,8 +1825,11 @@ BOOL reg_io_q_abort_shutdown(const char *desc, REG_Q_ABORT_SHUTDOWN *q_u, if (!prs_align(ps)) return False; - if (!prs_pointer("server", ps, depth, (void**)&q_u->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16)) + if (!prs_uint32("ptr_server", ps, depth, &(q_s->ptr_server))) return False; + if (q_s->ptr_server != 0) + if (!prs_uint16("server", ps, depth, &(q_s->server))) + return False; return True; } @@ -1718,10 +1837,10 @@ BOOL reg_io_q_abort_shutdown(const char *desc, REG_Q_ABORT_SHUTDOWN *q_u, /******************************************************************* reads or writes a structure. ********************************************************************/ -BOOL reg_io_r_abort_shutdown(const char *desc, REG_R_ABORT_SHUTDOWN *r_u, +BOOL reg_io_r_abort_shutdown(const char *desc, REG_R_ABORT_SHUTDOWN * r_s, prs_struct *ps, int depth) { - if ( !r_u ) + if (r_s == NULL) return False; prs_debug(ps, depth, desc, "reg_io_r_abort_shutdown"); @@ -1730,7 +1849,7 @@ BOOL reg_io_r_abort_shutdown(const char *desc, REG_R_ABORT_SHUTDOWN *r_u, if (!prs_align(ps)) return False; - if (!prs_werror("status", ps, depth, &r_u->status)) + if (!prs_werror("status", ps, depth, &r_s->status)) return False; return True; |