* changed structure of REG_R_ENUM_VALUE structure since the BUFFER2
[bbaumbach/samba-autobuild/.git] / source / rpc_parse / parse_reg.c
index b650847b809b8d5ce24dfc74e6c0e33672903cc9..3987f208851984d2dc9778b5a7eb15b89903bf8e 100644 (file)
@@ -1,10 +1,11 @@
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
  *  Copyright (C) Paul Ashton                       1997.
+ *  Copyright (C) Marc Jacobsen                     1999.
+ *  Copyright (C) Simo Sorce                        2000.
  *  
  *  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
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_PARSE
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_open_hklm(REG_Q_OPEN_HKLM *q_o,
+
+void init_reg_q_open_hkcr(REG_Q_OPEN_HKCR *q_o,
                                uint16 unknown_0, uint32 level)
 {
        q_o->ptr = 1;
@@ -42,569 +43,857 @@ void make_reg_q_open_hklm(REG_Q_OPEN_HKLM *q_o,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_open_hklm(char *desc,  REG_Q_OPEN_HKLM *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_open_hkcr(char *desc,  REG_Q_OPEN_HKCR *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
-       prs_debug(ps, depth, desc, "reg_io_q_open_hklm");
+       prs_debug(ps, depth, desc, "reg_io_q_open_hkcr");
        depth++;
 
-       prs_align(ps);
+       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("level    ", ps, depth, &r_q->level))
+                       return False;
+       }
+
+       return True;
+}
+
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+
+BOOL reg_io_r_open_hkcr(char *desc,  REG_R_OPEN_HKCR *r_r, prs_struct *ps, int depth)
+{
+       if (r_r == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "reg_io_r_open_hkcr");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("ptr      ", ps, depth, &(r_q->ptr      ));
+       if(!smb_io_pol_hnd("", &r_r->pol, ps, depth))
+               return False;
+
+       if(!prs_ntstatus("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(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)
        {
-               prs_uint16("unknown_0", ps, depth, &(r_q->unknown_0));
-               prs_uint16("unknown_1", ps, depth, &(r_q->unknown_1));
-               prs_uint32("level    ", ps, depth, &(r_q->level    ));
+               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.
 ********************************************************************/
-void reg_io_r_open_hklm(char *desc,  REG_R_OPEN_HKLM *r_r, prs_struct *ps, int depth)
+BOOL reg_io_r_open_hklm(char *desc, REG_R_OPEN_HKLM * r_r, prs_struct *ps,
+                       int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_open_hklm");
        depth++;
 
-       prs_align(ps);
-       
-       smb_io_pol_hnd("", &(r_r->pol), ps, depth);
+       if (!prs_align(ps))
+               return False;
+
+       if (!smb_io_pol_hnd("", &r_r->pol, ps, depth))
+               return False;
 
-       prs_uint32("status", ps, depth, &(r_r->status));
+       if (!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
+
+       return True;
 }
 
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_flush_key(REG_Q_FLUSH_KEY *q_u, POLICY_HND *pol)
+
+void init_reg_q_flush_key(REG_Q_FLUSH_KEY *q_u, POLICY_HND *pol)
 {
-       memcpy(&(q_u->pol), pol, sizeof(q_u->pol));
+       memcpy(&q_u->pol, pol, sizeof(q_u->pol));
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_flush_key(char *desc,  REG_Q_FLUSH_KEY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_flush_key(char *desc,  REG_Q_FLUSH_KEY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_flush_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth);
-}
+       if(!smb_io_pol_hnd("", &r_q->pol, ps, depth))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_flush_key(char *desc,  REG_R_FLUSH_KEY *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_flush_key(char *desc,  REG_R_FLUSH_KEY *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_flush_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("status", ps, depth, &(r_r->status));
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
+
+       return True;
 }
 
+/*******************************************************************
+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)
+{
+       if (ptr != 0) {
+               uint32 hdr_offset;
+               uint32 old_offset;
+               if(!smb_io_hdrbuf_pre("hdr_sec", hdr_sec, ps, depth, &hdr_offset))
+                       return False;
+
+               old_offset = prs_offset(ps);
+
+               if (ptr3 != NULL) {
+                       if(!prs_uint32("ptr3", ps, depth, ptr3))
+                               return False;
+               }
+
+               if (ptr3 == NULL || *ptr3 != 0) {
+                       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))
+                               return False;
+               if(!prs_set_offset(ps, old_offset + data->len + sizeof(uint32) * ((ptr3 != NULL) ? 5 : 3)))
+                       return False;
+
+               if(!prs_align(ps))
+                       return False;
+       }
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd,
-                               char *name, char *class,
-                               SEC_INFO *sam_access)
+
+void init_reg_q_create_key(REG_Q_CREATE_KEY *q_c, POLICY_HND *hnd,
+                               char *name, char *class, SEC_ACCESS *sam_access,
+                               SEC_DESC_BUF *sec_buf)
 {
        int len_name  = name  != NULL ? strlen(name ) + 1: 0;
        int len_class = class != NULL ? strlen(class) + 1: 0;
 
-       static unsigned char data[] =
-       {
-               0x01, 0x00, 0x00, 0x80,
-               0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00
-       };
-
        ZERO_STRUCTP(q_c);
 
-       memcpy(&(q_c->pnt_pol), hnd, sizeof(q_c->pnt_pol));
+       memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol));
 
-       make_uni_hdr(&(q_c->hdr_name), len_name, len_name, 1);
-       make_unistr2(&(q_c->uni_name), name, len_name);
+       init_uni_hdr(&q_c->hdr_name, len_name);
+       init_unistr2(&q_c->uni_name, name, len_name);
 
-       make_uni_hdr(&(q_c->hdr_class), len_class, len_class, 1);
-       make_unistr2(&(q_c->uni_class), class, len_class);
+       init_uni_hdr(&q_c->hdr_class, len_class);
+       init_unistr2(&q_c->uni_class, class, len_class);
 
        q_c->reserved = 0x00000000;
-       memcpy(&(q_c->sam_access), sam_access, sizeof(q_c->sam_access));
+       memcpy(&q_c->sam_access, sam_access, sizeof(q_c->sam_access));
 
        q_c->ptr1 = 1;
-       q_c->unknown_0 = 0x0000000C;
+       q_c->sec_info = DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION;
 
+       q_c->data = sec_buf;
        q_c->ptr2 = 1;
-       q_c->sec_len1 = 0x14;
-       q_c->sec_len2 = 0x14;
-       q_c->sec_len3 = 0x0;
-       q_c->sec_len4 = 0x14;
-       q_c->sec_len5 = 0x0;
-       q_c->sec_len6 = 0x14;
-
-       memcpy(&q_c->buf_unk, data, sizeof(q_c->buf_unk));
-
+       init_buf_hdr(&q_c->hdr_sec, sec_buf->len, sec_buf->len);
+       q_c->ptr3 = 1;
        q_c->unknown_2 = 0x00000000;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_create_key(char *desc,  REG_Q_CREATE_KEY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_create_key(char *desc,  REG_Q_CREATE_KEY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_create_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pnt_pol), ps, depth);
-
-       smb_io_unihdr ("", &(r_q->hdr_name), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_name), r_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
-
-       smb_io_unihdr ("", &(r_q->hdr_class), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_class), r_q->hdr_class.buffer, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("reserved", ps, depth, &(r_q->reserved));
-       sec_io_info("sam_access", &r_q->sam_access, ps, depth);
-
-       prs_uint32("ptr1", ps, depth, &(r_q->ptr1));
-       if (r_q->ptr2 != 0)
-       {
-               prs_uint32("unknown_0", ps, depth, &(r_q->unknown_0));
+       if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth))
+               return False;
+
+       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(!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, &r_q->reserved))
+               return False;
+       if(!sec_io_access("sam_access", &r_q->sam_access, ps, depth))
+               return False;
+
+       if(!prs_uint32("ptr1", ps, depth, &r_q->ptr1))
+               return False;
+
+       if (r_q->ptr1 != 0) {
+               if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info))
+                       return False;
        }
 
-       prs_uint32("ptr2", ps, depth, &(r_q->ptr2));
-       if (r_q->ptr2)
-       {
-               prs_uint32("sec_len1", ps, depth, &(r_q->sec_len1));
-               prs_uint32("sec_len2", ps, depth, &(r_q->sec_len2));
-               prs_uint32("sec_len3", ps, depth, &(r_q->sec_len3));
-               prs_uint32("sec_len4", ps, depth, &(r_q->sec_len4));
-               prs_uint32("sec_len5", ps, depth, &(r_q->sec_len5));
-               prs_uint32("sec_len6", ps, depth, &(r_q->sec_len6));
-               prs_uint8s(False, "buf_unk", ps, depth, r_q->buf_unk, sizeof(r_q->buf_unk));
-               prs_align(ps);
-
-               prs_uint32("unknown_2", ps, depth, &(r_q->unknown_2));
-       }
+       if(!prs_uint32("ptr2", ps, depth, &r_q->ptr2))
+               return False;
+       if(!reg_io_hdrbuf_sec(r_q->ptr2, &r_q->ptr3, &r_q->hdr_sec, r_q->data, ps, depth))
+               return False;
 
-       prs_align(ps);
-}
+       if(!prs_uint32("unknown_2", ps, depth, &r_q->unknown_2))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_create_key(char *desc,  REG_R_CREATE_KEY *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_create_key(char *desc,  REG_R_CREATE_KEY *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_create_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_r->key_pol), ps, depth);
-       prs_uint32("unknown", ps, depth, &(r_r->unknown));
+       if(!smb_io_pol_hnd("", &r_r->key_pol, ps, depth))
+               return False;
+       if(!prs_uint32("unknown", ps, depth, &r_r->unknown))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
-       prs_uint32("status", ps, depth, &(r_r->status));
+       return True;
 }
 
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_delete_val(REG_Q_DELETE_VALUE *q_c, POLICY_HND *hnd,
+
+void init_reg_q_delete_val(REG_Q_DELETE_VALUE *q_c, POLICY_HND *hnd,
                                char *name)
 {
        int len_name  = name  != NULL ? strlen(name ) + 1: 0;
        ZERO_STRUCTP(q_c);
 
-       memcpy(&(q_c->pnt_pol), hnd, sizeof(q_c->pnt_pol));
+       memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol));
 
-       make_uni_hdr(&(q_c->hdr_name), len_name, len_name, 1);
-       make_unistr2(&(q_c->uni_name), name, len_name);
+       init_uni_hdr(&q_c->hdr_name, len_name);
+       init_unistr2(&q_c->uni_name, name, len_name);
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_delete_val(char *desc,  REG_Q_DELETE_VALUE *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_delete_val(char *desc,  REG_Q_DELETE_VALUE *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_delete_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pnt_pol), ps, depth);
+       if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth))
+               return False;
 
-       smb_io_unihdr ("", &(r_q->hdr_name), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_name), r_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
+       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;
+
+       return True;
 }
 
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_delete_val(char *desc,  REG_R_DELETE_VALUE *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_delete_val(char *desc,  REG_R_DELETE_VALUE *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_delete_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("status", ps, depth, &(r_r->status));
-}
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_delete_key(REG_Q_DELETE_KEY *q_c, POLICY_HND *hnd,
+
+void init_reg_q_delete_key(REG_Q_DELETE_KEY *q_c, POLICY_HND *hnd,
                                char *name)
 {
        int len_name  = name  != NULL ? strlen(name ) + 1: 0;
        ZERO_STRUCTP(q_c);
 
-       memcpy(&(q_c->pnt_pol), hnd, sizeof(q_c->pnt_pol));
+       memcpy(&q_c->pnt_pol, hnd, sizeof(q_c->pnt_pol));
 
-       make_uni_hdr(&(q_c->hdr_name), len_name, len_name, 1);
-       make_unistr2(&(q_c->uni_name), name, len_name);
+       init_uni_hdr(&q_c->hdr_name, len_name);
+       init_unistr2(&q_c->uni_name, name, len_name);
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_delete_key(char *desc,  REG_Q_DELETE_KEY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_delete_key(char *desc,  REG_Q_DELETE_KEY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_delete_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pnt_pol), ps, depth);
+       if(!smb_io_pol_hnd("", &r_q->pnt_pol, ps, depth))
+               return False;
 
-       smb_io_unihdr ("", &(r_q->hdr_name), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_name), r_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
-}
+       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;
 
+       return True;
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_delete_key(char *desc,  REG_R_DELETE_KEY *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_delete_key(char *desc,  REG_R_DELETE_KEY *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_delete_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("status", ps, depth, &(r_r->status));
-}
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_query_key(REG_Q_QUERY_KEY *q_o, POLICY_HND *hnd,
+
+void init_reg_q_query_key(REG_Q_QUERY_KEY *q_o, POLICY_HND *hnd,
                                uint32 max_class_len)
 {
        ZERO_STRUCTP(q_o);
 
-       memcpy(&(q_o->pol), hnd, sizeof(q_o->pol));
-       make_uni_hdr(&q_o->hdr_class, max_class_len, 0, max_class_len > 0 ? 1 : 0);
+       memcpy(&q_o->pol, hnd, sizeof(q_o->pol));
+       init_uni_hdr(&q_o->hdr_class, max_class_len);
        q_o->uni_class.uni_max_len = max_class_len;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_query_key(char *desc,  REG_Q_QUERY_KEY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_query_key(char *desc,  REG_Q_QUERY_KEY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_query_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth);
-       smb_io_unihdr ("", &(r_q->hdr_class), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_class), r_q->hdr_class.buffer, ps, depth);
+       if(!smb_io_pol_hnd("", &r_q->pol, ps, depth))
+               return False;
+       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;
 
-       prs_align(ps);
+       return True;
 }
 
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_query_key(char *desc,  REG_R_QUERY_KEY *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_query_key(char *desc,  REG_R_QUERY_KEY *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_query_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_unihdr ("", &(r_r->hdr_class), ps, depth);
-       smb_io_unistr2("", &(r_r->uni_class), r_r->hdr_class.buffer, ps, depth);
-
-       prs_align(ps);
-
-       prs_uint32("num_subkeys   ", ps, depth, &(r_r->num_subkeys   ));
-       prs_uint32("max_subkeylen ", ps, depth, &(r_r->max_subkeylen ));
-       prs_uint32("mak_subkeysize", ps, depth, &(r_r->max_subkeysize));
-       prs_uint32("num_values    ", ps, depth, &(r_r->num_values    ));
-       prs_uint32("max_valnamelen", ps, depth, &(r_r->max_valnamelen));
-       prs_uint32("max_valbufsize", ps, depth, &(r_r->max_valbufsize));
-       prs_uint32("sec_desc      ", ps, depth, &(r_r->sec_desc      ));
-       smb_io_time("mod_time     ", &(r_r->mod_time), ps, depth);
+       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_r->num_subkeys))
+               return False;
+       if(!prs_uint32("max_subkeylen ", ps, depth, &r_r->max_subkeylen))
+               return False;
+       if(!prs_uint32("reserved      ", ps, depth, &r_r->reserved))
+               return False;
+       if(!prs_uint32("num_values    ", ps, depth, &r_r->num_values))
+               return False;
+       if(!prs_uint32("max_valnamelen", ps, depth, &r_r->max_valnamelen))
+               return False;
+       if(!prs_uint32("max_valbufsize", ps, depth, &r_r->max_valbufsize))
+               return False;
+       if(!prs_uint32("sec_desc      ", ps, depth, &r_r->sec_desc))
+               return False;
+       if(!smb_io_time("mod_time     ", &r_r->mod_time, ps, depth))
+               return False;
        
-       prs_uint32("status", ps, depth, &(r_r->status));
-}
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_unk_1a(REG_Q_UNK_1A *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));
+       memcpy(&q_o->pol, hnd, sizeof(q_o->pol));
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_unk_1a(char *desc,  REG_Q_UNK_1A *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_unknown_1a(char *desc,  REG_Q_UNKNOWN_1A *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
-       prs_debug(ps, depth, desc, "reg_io_q_unk_1a");
+       prs_debug(ps, depth, desc, "reg_io_q_unknown_1a");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth);
-}
+       if(!smb_io_pol_hnd("", &r_q->pol, ps, depth))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_unk_1a(char *desc,  REG_R_UNK_1A *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_unknown_1a(char *desc,  REG_R_UNKNOWN_1A *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
-       prs_debug(ps, depth, desc, "reg_io_r_unk_1a");
+       prs_debug(ps, depth, desc, "reg_io_r_unknown_1a");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("unknown", ps, depth, &(r_r->unknown));
-       prs_uint32("status" , ps, depth, &(r_r->status ));
-}
+       if(!prs_uint32("unknown", ps, depth, &r_r->unknown))
+               return False;
+       if(!prs_ntstatus("status" , ps, depth, &r_r->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_q_open_hku(REG_Q_OPEN_HKU *q_o,
-                               uint16 unknown_0, uint32 level)
+
+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->level = level;
+       q_o->access_mask = access_mask;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_open_hku(char *desc,  REG_Q_OPEN_HKU *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_open_hku(char *desc,  REG_Q_OPEN_HKU *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_open_hku");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("ptr      ", ps, depth, &(r_q->ptr      ));
-       if (r_q->ptr != 0)
-       {
-               prs_uint16("unknown_0", ps, depth, &(r_q->unknown_0));
-               prs_uint16("unknown_1", ps, depth, &(r_q->unknown_1));
-               prs_uint32("level    ", ps, depth, &(r_q->level    ));
+       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.
 ********************************************************************/
-void reg_io_r_open_hku(char *desc,  REG_R_OPEN_HKU *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_open_hku(char *desc,  REG_R_OPEN_HKU *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_open_hku");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_r->pol), ps, depth);
+       if(!smb_io_pol_hnd("", &r_r->pol, ps, depth))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
-       prs_uint32("status", ps, depth, &(r_r->status));
+       return True;
 }
 
+/*******************************************************************
+ Inits an REG_Q_CLOSE structure.
+********************************************************************/
+
+void init_reg_q_close(REG_Q_CLOSE *q_c, POLICY_HND *hnd)
+{
+       DEBUG(5,("init_reg_q_close\n"));
+
+       memcpy(&q_c->pol, hnd, sizeof(q_c->pol));
+}
 
 /*******************************************************************
-makes an REG_Q_CLOSE structure.
+reads or writes a structure.
 ********************************************************************/
-void make_reg_q_close(REG_Q_CLOSE *q_c, POLICY_HND *hnd)
+
+BOOL reg_io_q_close(char *desc,  REG_Q_CLOSE *q_u, prs_struct *ps, int depth)
 {
-       if (q_c == NULL || hnd == NULL) return;
+       if (q_u == NULL)
+               return False;
 
-       DEBUG(5,("make_reg_q_close\n"));
+       prs_debug(ps, depth, desc, "reg_io_q_close");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!smb_io_pol_hnd("", &q_u->pol, ps, depth))
+               return False;
+       if(!prs_align(ps))
+               return False;
 
-       memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+       return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_close(char *desc,  REG_Q_CLOSE *q_u, prs_struct *ps, int depth)
+
+BOOL reg_io_r_close(char *desc,  REG_R_CLOSE *r_u, prs_struct *ps, int depth)
 {
-       if (q_u == NULL) return;
+       if (r_u == NULL)
+               return False;
 
-       prs_debug(ps, depth, desc, "reg_io_q_unknown_1");
+       prs_debug(ps, depth, desc, "reg_io_r_close");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
+
+       if(!smb_io_pol_hnd("", &r_u->pol, ps, depth))
+               return False;
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_u->status))
+               return False;
 
-       smb_io_pol_hnd("", &(q_u->pol), ps, depth); 
-       prs_align(ps);
+       return True;
+}
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+
+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_i->pol, pol, sizeof(q_i->pol));
+
+       q_i->sec_info = DACL_SECURITY_INFORMATION;
+
+       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.
 ********************************************************************/
-void reg_io_r_close(char *desc,  REG_R_CLOSE *r_u, prs_struct *ps, int depth)
+
+BOOL reg_io_q_set_key_sec(char *desc,  REG_Q_SET_KEY_SEC *r_q, prs_struct *ps, int depth)
 {
-       if (r_u == NULL) return;
+       if (r_q == NULL)
+               return False;
 
-       prs_debug(ps, depth, desc, "reg_io_r_unknown_1");
+       prs_debug(ps, depth, desc, "reg_io_q_set_key_sec");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
+       
+       if(!smb_io_pol_hnd("", &r_q->pol, ps, depth))
+               return False;
+
+       if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info))
+               return False;
+       if(!prs_uint32("ptr    ", ps, depth, &r_q->ptr))
+               return False;
 
-       smb_io_pol_hnd("", &(r_u->pol), ps, depth); 
-       prs_align(ps);
+       if(!reg_io_hdrbuf_sec(r_q->ptr, NULL, &r_q->hdr_sec, r_q->data, ps, depth))
+               return False;
 
-       prs_uint32("status", ps, depth, &(r_u->status));
+       return True;
 }
 
 /*******************************************************************
-makes a structure.
+reads or writes a structure.
 ********************************************************************/
-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)
+
+BOOL reg_io_r_set_key_sec(char *desc, REG_R_SET_KEY_SEC *r_q, prs_struct *ps, int depth)
 {
-       if (q_i == NULL) return;
+       if (r_q == NULL)
+               return False;
 
-       memcpy(&(q_i->pol), pol, sizeof(q_i->pol));
+       prs_debug(ps, depth, desc, "reg_io_r_set_key_sec");
+       depth++;
 
-       q_i->unknown = 0x7;
+       if(!prs_align(ps))
+               return False;
+       
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
 
-       q_i->ptr = sec_buf != NULL ? 1 : 0;
-       q_i->data = sec_buf;
+       return True;
+}
 
-       if (sec_buf != NULL)
-       {
-               make_buf_hdr(&(q_i->hdr_sec), buf_len, 0);
-               q_i->data->max_len = buf_len;
-               q_i->data->undoc = 0;
-               q_i->data->len = 0;
-               q_i->data->sec = NULL;
-       }
+
+/*******************************************************************
+makes a structure.
+********************************************************************/
+
+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_i->pol, pol, sizeof(q_i->pol));
+
+       q_i->sec_info = OWNER_SECURITY_INFORMATION |
+                       GROUP_SECURITY_INFORMATION |
+                       DACL_SECURITY_INFORMATION;
+
+       q_i->ptr = psdb != NULL ? 1 : 0;
+       q_i->data = psdb;
+
+       init_buf_hdr(&q_i->hdr_sec, sec_buf_size, 0);
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_get_key_sec(char *desc,  REG_Q_GET_KEY_SEC *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_get_key_sec(char *desc,  REG_Q_GET_KEY_SEC *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_get_key_sec");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth); 
+       if(!smb_io_pol_hnd("", &r_q->pol, ps, depth))
+               return False;
 
-       prs_uint32("unknown", ps, depth, &(r_q->unknown));
-       prs_uint32("ptr    ", ps, depth, &(r_q->ptr    ));
+       if(!prs_uint32("sec_info", ps, depth, &r_q->sec_info))
+               return False;
+       if(!prs_uint32("ptr     ", ps, depth, &r_q->ptr))
+               return False;
 
-       if (r_q->ptr != 0)
-       {
-               smb_io_hdrbuf  ("hdr_sec", &(r_q->hdr_sec), ps, depth);
-               sec_io_desc_buf("data   ",   r_q->data    , ps, depth);
+       if(!reg_io_hdrbuf_sec(r_q->ptr, NULL, &r_q->hdr_sec, r_q->data, ps, depth))
+               return False;
 
-               prs_align(ps);
-       }
+       return True;
 }
 
 #if 0
 /*******************************************************************
 makes a structure.
 ********************************************************************/
- void make_reg_r_get_key_sec(REG_R_GET_KEY_SEC *r_i, POLICY_HND *pol, 
+ void init_reg_r_get_key_sec(REG_R_GET_KEY_SEC *r_i, POLICY_HND *pol, 
                                uint32 buf_len, uint8 *buf,
-                               uint32 status)
+                               NTSTATUS status)
 {
-       if (r_i == NULL) return;
-
        r_i->ptr = 1;
-       make_buf_hdr(&(r_i->hdr_sec), buf_len, buf_len);
-       make_sec_desc_buf(r_i->data, buf_len, 1);
+       init_buf_hdr(&r_i->hdr_sec, buf_len, buf_len);
+       init_sec_desc_buf(r_i->data, buf_len, 1);
 
        r_i->status = status; /* 0x0000 0000 or 0x0000 007a */
 }
@@ -613,185 +902,227 @@ makes a structure.
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_get_key_sec(char *desc,  REG_R_GET_KEY_SEC *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_r_get_key_sec(char *desc,  REG_R_GET_KEY_SEC *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_get_key_sec");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("ptr      ", ps, depth, &(r_q->ptr      ));
-
-       if (r_q->ptr != 0)
-       {
-               smb_io_hdrbuf("", &(r_q->hdr_sec), ps, depth);
-               sec_io_desc_buf("", r_q->data, ps, depth);
-
-               prs_align(ps);
+       if(!prs_uint32("ptr      ", ps, depth, &r_q->ptr))
+               return False;
+
+       if (r_q->ptr != 0) {
+               if(!smb_io_hdrbuf("", &r_q->hdr_sec, ps, depth))
+                       return False;
+               if(!sec_io_desc_buf("", &r_q->data, ps, depth))
+                       return False;
+               if(!prs_align(ps))
+                       return False;
        }
 
-       prs_uint32("status", ps, depth, &(r_q->status));
-}
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-void make_reg_q_info(REG_Q_INFO *q_i, POLICY_HND *pol, char *product_type,
-                               time_t unix_time, uint8 major, uint8 minor)
+
+BOOL init_reg_q_info(REG_Q_INFO *q_i, POLICY_HND *pol, char* val_name)
 {
-       int len_type  = strlen(product_type);
+        int len_type = val_name != NULL ? strlen(val_name) + 1 : 0;
 
-       if (q_i == NULL) return;
+        if (q_i == NULL)
+                return False;
 
-       memcpy(&(q_i->pol), pol, sizeof(q_i->pol));
+        q_i->pol = *pol;
 
-       make_uni_hdr(&(q_i->hdr_type), len_type, len_type, 1);
-       make_unistr2(&(q_i->uni_type), product_type, len_type);
+        init_uni_hdr(&(q_i->hdr_type), len_type);
+        init_unistr2(&(q_i->uni_type), val_name, len_type);
 
-       q_i->ptr1 = 1;
-       unix_to_nt_time(&(q_i->time), unix_time);
-       q_i->major_version1 = major;
-       q_i->minor_version1 = minor;
-       memset(q_i->pad1, 0, sizeof(q_i->pad1));
+        q_i->ptr_reserved = 1;
+        q_i->ptr_buf = 1;
 
-       q_i->ptr2 = 1;
-       q_i->major_version2 = major;
-       q_i->minor_version2 = minor;
-       memset(q_i->pad2, 0, sizeof(q_i->pad2));
+        q_i->ptr_bufsize = 1;
+        q_i->bufsize = 0;
+        q_i->buf_unk = 0;
 
-       q_i->ptr3 = 1;
-       q_i->unknown = 0x00000000;
+        q_i->unk1 = 0;
+        q_i->ptr_buflen = 1;
+        q_i->buflen = 0;
+
+        q_i->ptr_buflen2 = 1;
+        q_i->buflen2 = 0;
+
+        return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_info(char *desc,  REG_Q_INFO *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_info(char *desc,  REG_Q_INFO *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_info");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth); 
-       smb_io_unihdr ("", &(r_q->hdr_type), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_type), r_q->hdr_type.buffer, ps, depth);
-
-       prs_align(ps);
+       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(!smb_io_unistr2("", &r_q->uni_type, r_q->hdr_type.buffer, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("ptr1", ps, depth, &(r_q->ptr1));
-
-       if (r_q->ptr1 != 0)
-       {
-               smb_io_time("", &(r_q->time), ps, depth);
-               prs_uint8 ("major_version1", ps, depth, &(r_q->major_version1));
-               prs_uint8 ("minor_version1", ps, depth, &(r_q->minor_version1));
-               prs_uint8s(False, "pad1", ps, depth, r_q->pad1, sizeof(r_q->pad1));
+       if(!prs_uint32("ptr_reserved", ps, depth, &(r_q->ptr_reserved)))
+               return False;
+
+       if(!prs_uint32("ptr_buf", ps, depth, &(r_q->ptr_buf)))
+               return False;
+
+       if(r_q->ptr_buf) {
+               if(!prs_uint32("ptr_bufsize", ps, depth, &(r_q->ptr_bufsize)))
+                       return False;
+               if(!prs_uint32("bufsize", ps, depth, &(r_q->bufsize)))
+                       return False;
+               if(!prs_uint32("buf_unk", ps, depth, &(r_q->buf_unk)))
+                       return False;
        }
 
-       prs_uint32("ptr2", ps, depth, &(r_q->ptr2));
-
-       if (r_q->ptr2 != 0)
-       {
-               prs_uint8 ("major_version2", ps, depth, &(r_q->major_version2));
-               prs_uint8 ("minor_version2", ps, depth, &(r_q->minor_version2));
-               prs_uint8s(False, "pad2", ps, depth, r_q->pad2, sizeof(r_q->pad2));
-       }
+       if(!prs_uint32("unk1", ps, depth, &(r_q->unk1)))
+               return False;
 
-       prs_uint32("ptr3", ps, depth, &(r_q->ptr3));
+       if(!prs_uint32("ptr_buflen", ps, depth, &(r_q->ptr_buflen)))
+               return False;
 
-       if (r_q->ptr3 != 0)
-       {
-               prs_uint32("unknown", ps, depth, &(r_q->unknown));
+       if (r_q->ptr_buflen) {
+               if(!prs_uint32("buflen", ps, depth, &(r_q->buflen)))
+                       return False;
+               if(!prs_uint32("ptr_buflen2", ps, depth, &(r_q->ptr_buflen2)))
+                       return False;
+               if(!prs_uint32("buflen2", ps, depth, &(r_q->buflen2)))
+                       return False;
        }
-}
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_r_info(REG_R_INFO *r_r,
-                               uint32 level, char *os_type,
-                               uint32 unknown_0, uint32 unknown_1,
-                               uint32 status)
+
+BOOL init_reg_r_info(uint32 include_keyval, REG_R_INFO *r_r,
+                    BUFFER2* buf, uint32 type, NTSTATUS status)
 {
-       uint8 buf[512];
-       int len = struni2((uint16*)buf, os_type);
+  if(r_r == NULL)
+    return False;
 
-       r_r->ptr1 = 1;
-       r_r->level = level;
+  
+  r_r->ptr_type = 1;
+  r_r->type = type;
 
-       r_r->ptr_type = 1;
-       make_buffer2(&(r_r->uni_type), buf, len*2);
+  /* 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->ptr2 = 1;
-       r_r->unknown_0 = unknown_0;
+  r_r->ptr_max_len = 1;
+  r_r->buf_max_len = r_r->uni_val->buf_max_len;
 
-       r_r->ptr3 = 1;
-       r_r->unknown_1 = unknown_1;
+  r_r->ptr_len = 1;
+  r_r->buf_len = r_r->uni_val->buf_len;
 
-       r_r->status = status;
+  r_r->status = status;
+
+  return True;
+  
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_info(char *desc, REG_R_INFO *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_info(char *desc, REG_R_INFO *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_info");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("ptr1", ps, depth, &(r_r->ptr1));
+       if(!prs_uint32("ptr_type", ps, depth, &(r_r->ptr_type)))
+               return False;
 
-       if (r_r->ptr1 != 0)
-       {
-               prs_uint32("level", ps, depth, &(r_r->level));
-               prs_uint32("ptr_type", ps, depth, &(r_r->ptr_type));
+       if (r_r->ptr_type != 0) {
+               if(!prs_uint32("type", ps, depth, &r_r->type))
+                       return False;
+       }
 
-               smb_io_buffer2("uni_type", &(r_r->uni_type), r_r->ptr_type, ps, depth);
+       if(!prs_uint32("ptr_uni_val", ps, depth, &(r_r->ptr_uni_val)))
+               return False;
 
-               prs_uint32("ptr2", ps, depth, &(r_r->ptr2));
+       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 (r_r->ptr2 != 0)
-               {
-                       prs_uint32("unknown_0", ps, depth, &(r_r->unknown_0));
-               }
+       if(!prs_align(ps))
+               return False;
 
-               prs_uint32("ptr3", ps, depth, &(r_r->ptr3));
+       if(!prs_uint32("ptr_max_len", ps, depth, &(r_r->ptr_max_len)))
+               return False;
 
-               if (r_r->ptr3 != 0)
-               {
-                       prs_uint32("unknown_1", ps, depth, &(r_r->unknown_1));
-               }
+       if (r_r->ptr_max_len != 0) {
+               if(!prs_uint32("buf_max_len", ps, depth, &(r_r->buf_max_len)))
+               return False;
+       }
 
+       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;
        }
-       prs_uint32("status", ps, depth, &(r_r->status));
+
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-void make_reg_q_enum_val(REG_Q_ENUM_VALUE *q_i, POLICY_HND *pol,
+
+void init_reg_q_enum_val(REG_Q_ENUM_VALUE *q_i, POLICY_HND *pol,
                                uint32 val_idx, uint32 max_val_len,
                                uint32 max_buf_len)
 {
-       if (q_i == NULL) return;
-
        ZERO_STRUCTP(q_i);
 
-       memcpy(&(q_i->pol), pol, sizeof(q_i->pol));
+       memcpy(&q_i->pol, pol, sizeof(q_i->pol));
 
        q_i->val_index = val_idx;
-       make_uni_hdr(&q_i->hdr_name, max_val_len, 0, 1);
+       init_uni_hdr(&q_i->hdr_name, max_val_len);
        q_i->uni_name.uni_max_len = max_val_len;
        
        q_i->ptr_type = 1;
@@ -807,107 +1138,170 @@ void make_reg_q_enum_val(REG_Q_ENUM_VALUE *q_i, POLICY_HND *pol,
        q_i->len_value2 = 0;
 }
 
+/*******************************************************************
+makes a structure.
+********************************************************************/
+
+void init_reg_r_enum_val(REG_R_ENUM_VALUE *r_u, REGISTRY_VALUE *val )
+{
+       ZERO_STRUCTP(r_u);
+
+       /* value name */
+
+       init_uni_hdr( &r_u->hdr_name, strlen(val->valuename)+1 );
+       init_unistr2( &r_u->uni_name, val->valuename, strlen(val->valuename)+1 );
+               
+       /* type */
+       
+       r_u->ptr_type = 1;
+       r_u->type = val->type;
+
+       /* data */
+       
+       r_u->ptr_value = 1;
+       init_buffer2( &r_u->buf_value, val->data.void_ptr, val->size );
+       
+       /* lengths */
+
+       r_u->ptr1 = 1;
+       r_u->len_value1 = val->size;
+       
+       r_u->ptr2 = 1;
+       r_u->len_value2 = val->size;
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_enum_val(char *desc,  REG_Q_ENUM_VALUE *q_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_enum_val(char *desc,  REG_Q_ENUM_VALUE *q_q, prs_struct *ps, int depth)
 {
-       if (q_q == NULL) return;
+       if (q_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_enum_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(q_q->pol), ps, depth); 
+       if(!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
        
-       prs_uint32("val_index", ps, depth, &(q_q->val_index));
-       smb_io_unihdr ("hdr_name", &(q_q->hdr_name), ps, depth);
-       smb_io_unistr2("uni_name", &(q_q->uni_name), q_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("ptr_type", ps, depth, &(q_q->ptr_type));
-
-       if (q_q->ptr_type != 0)
-       {
-               prs_uint32("type", ps, depth, &(q_q->type));
+       if(!prs_uint32("val_index", ps, depth, &q_q->val_index))
+               return False;
+               
+       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("ptr_type", ps, depth, &q_q->ptr_type))
+               return False;
+
+       if (q_q->ptr_type != 0) {
+               if(!prs_uint32("type", ps, depth, &q_q->type))
+                       return False;
        }
 
-       prs_uint32("ptr_value", ps, depth, &(q_q->ptr_value));
-       smb_io_buffer2("buf_value", &(q_q->buf_value), q_q->ptr_value, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("ptr1", ps, depth, &(q_q->ptr1));
-       if (q_q->ptr1 != 0)
-       {
-               prs_uint32("len_value1", ps, depth, &(q_q->len_value1));
+       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_uint32("ptr1", ps, depth, &q_q->ptr1))
+               return False;
+       if (q_q->ptr1 != 0) {
+               if(!prs_uint32("len_value1", ps, depth, &q_q->len_value1))
+                       return False;
        }
-       prs_uint32("ptr2", ps, depth, &(q_q->ptr2));
-       if (q_q->ptr2 != 0)
-       {
-               prs_uint32("len_value2", ps, depth, &(q_q->len_value2));
+       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;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_enum_val(char *desc,  REG_R_ENUM_VALUE *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_r_enum_val(char *desc,  REG_R_ENUM_VALUE *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_enum_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_unihdr ("hdr_name", &(r_q->hdr_name), ps, depth);
-       smb_io_unistr2("uni_name", &(r_q->uni_name), r_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("ptr_type", ps, depth, &(r_q->ptr_type));
-
-       if (r_q->ptr_type != 0)
-       {
-               prs_uint32("type", ps, depth, &(r_q->type));
+       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_uint32("ptr_type", ps, depth, &r_q->ptr_type))
+               return False;
+
+       if (r_q->ptr_type != 0) {
+               if(!prs_uint32("type", ps, depth, &r_q->type))
+                       return False;
        }
 
-       prs_uint32("ptr_value", ps, depth, &(r_q->ptr_value));
-       smb_io_buffer2("buf_value", r_q->buf_value, r_q->ptr_value, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("ptr1", ps, depth, &(r_q->ptr1));
-       if (r_q->ptr1 != 0)
-       {
-               prs_uint32("len_value1", ps, depth, &(r_q->len_value1));
+       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_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;
        }
 
-       prs_uint32("ptr2", ps, depth, &(r_q->ptr2));
-       if (r_q->ptr2 != 0)
-       {
-               prs_uint32("len_value2", ps, depth, &(r_q->len_value2));
+       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;
        }
 
-       prs_uint32("status", ps, depth, &(r_q->status));
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-void make_reg_q_create_val(REG_Q_CREATE_VALUE *q_i, POLICY_HND *pol,
+
+void init_reg_q_create_val(REG_Q_CREATE_VALUE *q_i, POLICY_HND *pol,
                                char *val_name, uint32 type,
                                BUFFER3 *val)
 {
        int val_len = strlen(val_name) + 1;
 
-       if (q_i == NULL) return;
-
        ZERO_STRUCTP(q_i);
 
-       memcpy(&(q_i->pol), pol, sizeof(q_i->pol));
+       memcpy(&q_i->pol, pol, sizeof(q_i->pol));
 
-       make_uni_hdr(&q_i->hdr_name, val_len, val_len, 1);
-       make_unistr2(&(q_i->uni_name), val_name, val_len);
+       init_uni_hdr(&q_i->hdr_name, val_len);
+       init_unistr2(&q_i->uni_name, val_name, val_len);
        
        q_i->type      = type;
        q_i->buf_value = val;
@@ -916,49 +1310,66 @@ void make_reg_q_create_val(REG_Q_CREATE_VALUE *q_i, POLICY_HND *pol,
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_create_val(char *desc,  REG_Q_CREATE_VALUE *q_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_create_val(char *desc,  REG_Q_CREATE_VALUE *q_q, prs_struct *ps, int depth)
 {
-       if (q_q == NULL) return;
+       if (q_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_create_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(q_q->pol), ps, depth); 
+       if(!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
        
-       smb_io_unihdr ("hdr_name", &(q_q->hdr_name), ps, depth);
-       smb_io_unistr2("uni_name", &(q_q->uni_name), q_q->hdr_name.buffer, ps, depth);
-       prs_align(ps);
-
-       prs_uint32("type", ps, depth, &(q_q->type));
-       smb_io_buffer3("buf_value", q_q->buf_value, ps, depth);
-       prs_align(ps);
+       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_q->type))
+               return False;
+       if(!smb_io_buffer3("buf_value", q_q->buf_value, ps, depth))
+               return False;
+       if(!prs_align(ps))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_create_val(char *desc,  REG_R_CREATE_VALUE *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_r_create_val(char *desc,  REG_R_CREATE_VALUE *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_create_val");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("status", ps, depth, &(r_q->status));
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
+
+       return True;
 }
 
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-void make_reg_q_enum_key(REG_Q_ENUM_KEY *q_i, POLICY_HND *pol, uint32 key_idx)
-{
-       if (q_i == NULL) return;
 
-       memcpy(&(q_i->pol), pol, sizeof(q_i->pol));
+void init_reg_q_enum_key(REG_Q_ENUM_KEY *q_i, POLICY_HND *pol, uint32 key_idx)
+{
+       memcpy(&q_i->pol, pol, sizeof(q_i->pol));
 
        q_i->key_index = key_idx;
        q_i->key_name_len = 0;
@@ -975,158 +1386,355 @@ void make_reg_q_enum_key(REG_Q_ENUM_KEY *q_i, POLICY_HND *pol, uint32 key_idx)
        unix_to_nt_time(&q_i->time, 0);            /* current time? */
 }
 
+/*******************************************************************
+makes a reply structure.
+********************************************************************/
+
+void init_reg_r_enum_key(REG_R_ENUM_KEY *r_u, char *subkey, uint32 unknown_1,
+                       uint32 unknown_2)
+{
+       if ( !r_u )
+               return;
+               
+       r_u->unknown_1 = unknown_1;
+       r_u->unknown_2 = unknown_2;
+       r_u->unknown_3 = 0x0;
+       
+       r_u->key_name_len = (strlen(subkey)+1) * 2;
+       if (r_u->key_name_len)
+               r_u->ptr1 = 0x1;
+       init_unistr3( &r_u->key_name, subkey );
+       
+       r_u->ptr2 = 0x1;
+       r_u->ptr3 = 0x1;
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_enum_key(char *desc,  REG_Q_ENUM_KEY *q_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_enum_key(char *desc,  REG_Q_ENUM_KEY *q_q, prs_struct *ps, int depth)
 {
-       if (q_q == NULL) return;
+       if (q_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_enum_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(q_q->pol), ps, depth); 
+       if(!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
        
-       prs_uint32("key_index", ps, depth, &(q_q->key_index));
-       prs_uint16("key_name_len", ps, depth, &(q_q->key_name_len));
-       prs_uint16("unknown_1", ps, depth, &(q_q->unknown_1));
-
-       prs_uint32("ptr1", ps, depth, &(q_q->ptr1));
-
-       if (q_q->ptr1 != 0)
-       {
-               prs_uint32("unknown_2", ps, depth, &(q_q->unknown_2));
-               prs_uint8s(False, "pad1", ps, depth, q_q->pad1, sizeof(q_q->pad1));
+       if(!prs_uint32("key_index", ps, depth, &q_q->key_index))
+               return False;
+       if(!prs_uint16("key_name_len", ps, depth, &q_q->key_name_len))
+               return False;
+       if(!prs_uint16("unknown_1", ps, depth, &q_q->unknown_1))
+               return False;
+
+       if(!prs_uint32("ptr1", ps, depth, &q_q->ptr1))
+               return False;
+
+       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_q->pad1, sizeof(q_q->pad1)))
+                       return False;
        }
 
-       prs_uint32("ptr2", ps, depth, &(q_q->ptr2));
+       if(!prs_uint32("ptr2", ps, depth, &q_q->ptr2))
+               return False;
 
-       if (q_q->ptr2 != 0)
-       {
-               prs_uint8s(False, "pad2", ps, depth, q_q->pad2, sizeof(q_q->pad2));
+       if (q_q->ptr2 != 0) {
+               if(!prs_uint8s(False, "pad2", ps, depth, q_q->pad2, sizeof(q_q->pad2)))
+                       return False;
        }
 
-       prs_uint32("ptr3", ps, depth, &(q_q->ptr3));
+       if(!prs_uint32("ptr3", ps, depth, &q_q->ptr3))
+               return False;
 
-       if (q_q->ptr3 != 0)
-       {
-               smb_io_time("", &(q_q->time), ps, depth);
+       if (q_q->ptr3 != 0) {
+               if(!smb_io_time("", &q_q->time, ps, depth))
+                       return False;
        }
+
+       return True;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_enum_key(char *desc,  REG_R_ENUM_KEY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_r_enum_key(char *desc,  REG_R_ENUM_KEY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_enum_key");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint16("key_name_len", ps, depth, &(r_q->key_name_len));
-       prs_uint16("unknown_1", ps, depth, &(r_q->unknown_1));
-
-       prs_uint32("ptr1", ps, depth, &(r_q->ptr1));
-
-       if (r_q->ptr1 != 0)
-       {
-               prs_uint32("unknown_2", ps, depth, &(r_q->unknown_2));
-               prs_uint32("unknown_3", ps, depth, &(r_q->unknown_3));
-               smb_io_unistr3("key_name", &(r_q->key_name), ps, depth);
-               prs_align(ps);
+       if(!prs_uint16("key_name_len", ps, depth, &r_q->key_name_len))
+               return False;
+       if(!prs_uint16("unknown_1", ps, depth, &r_q->unknown_1))
+               return False;
+
+       if(!prs_uint32("ptr1", ps, depth, &r_q->ptr1))
+               return False;
+
+       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, &r_q->unknown_3))
+                       return False;
+               if(!smb_io_unistr3("key_name", &r_q->key_name, ps, depth))
+                       return False;
+               if(!prs_align(ps))
+                       return False;
        }
 
-       prs_uint32("ptr2", ps, depth, &(r_q->ptr2));
+       if(!prs_uint32("ptr2", ps, depth, &r_q->ptr2))
+               return False;
 
-       if (r_q->ptr2 != 0)
-       {
-               prs_uint8s(False, "pad2", ps, depth, r_q->pad2, sizeof(r_q->pad2));
+       if (r_q->ptr2 != 0) {
+               if(!prs_uint8s(False, "pad2", ps, depth, r_q->pad2, sizeof(r_q->pad2)))
+                       return False;
        }
 
-       prs_uint32("ptr3", ps, depth, &(r_q->ptr3));
+       if(!prs_uint32("ptr3", ps, depth, &r_q->ptr3))
+               return False;
 
-       if (r_q->ptr3 != 0)
-       {
-               smb_io_time("", &(r_q->time), ps, depth);
+       if (r_q->ptr3 != 0) {
+               if(!smb_io_time("", &r_q->time, ps, depth))
+                       return False;
        }
 
-       prs_uint32("status", ps, depth, &(r_q->status));
-}
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
 makes a structure.
 ********************************************************************/
-void make_reg_q_open_entry(REG_Q_OPEN_ENTRY *r_q, POLICY_HND *pol,
-                               char *key_name, uint32 unk)
+
+void init_reg_q_open_entry(REG_Q_OPEN_ENTRY *r_q, POLICY_HND *pol,
+                               char *key_name, uint32 access_desired)
 {
        int len_name = strlen(key_name)+1;
 
-       if (r_q == NULL) return;
-
-       memcpy(&(r_q->pol), pol, sizeof(r_q->pol));
+       memcpy(&r_q->pol, pol, sizeof(r_q->pol));
 
-       make_uni_hdr(&(r_q->hdr_name), len_name, len_name, 1);
-       make_unistr2(&(r_q->uni_name), key_name, len_name);
+       init_uni_hdr(&r_q->hdr_name, len_name);
+       init_unistr2(&r_q->uni_name, key_name, len_name);
 
        r_q->unknown_0 = 0x00000000;
-       r_q->unknown_1 = unk;
+       r_q->access_desired = access_desired;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_q_open_entry(char *desc,  REG_Q_OPEN_ENTRY *r_q, prs_struct *ps, int depth)
+
+BOOL reg_io_q_open_entry(char *desc,  REG_Q_OPEN_ENTRY *r_q, prs_struct *ps, int depth)
 {
-       if (r_q == NULL) return;
+       if (r_q == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_q_entry");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_q->pol), ps, depth);
-       smb_io_unihdr ("", &(r_q->hdr_name), ps, depth);
-       smb_io_unistr2("", &(r_q->uni_name), r_q->hdr_name.buffer, ps, depth);
-
-       prs_align(ps);
+       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(!smb_io_unistr2("", &r_q->uni_name, r_q->hdr_name.buffer, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
        
-       prs_uint32("unknown_0", ps, depth, &(r_q->unknown_0));
-       prs_uint32("unknown_1", ps, depth, &(r_q->unknown_1));
-}
+       if(!prs_uint32("unknown_0        ", ps, depth, &r_q->unknown_0))
+               return False;
+       if(!prs_uint32("asccess_desired  ", ps, depth, &r_q->access_desired))
+               return False;
 
+       return True;
+}
 
 /*******************************************************************
-creates a structure.
+ Inits a structure.
 ********************************************************************/
-void make_reg_r_open_entry(REG_R_OPEN_ENTRY *r_r,
-                               POLICY_HND *pol, uint32 status)
-{
-       if (r_r == NULL) return;
 
-       memcpy(&(r_r->pol), pol, sizeof(r_r->pol));
+void init_reg_r_open_entry(REG_R_OPEN_ENTRY *r_r,
+                          POLICY_HND *pol, NTSTATUS status)
+{
+       memcpy(&r_r->pol, pol, sizeof(r_r->pol));
        r_r->status = status;
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void reg_io_r_open_entry(char *desc,  REG_R_OPEN_ENTRY *r_r, prs_struct *ps, int depth)
+
+BOOL reg_io_r_open_entry(char *desc,  REG_R_OPEN_ENTRY *r_r, prs_struct *ps, int depth)
 {
-       if (r_r == NULL) return;
+       if (r_r == NULL)
+               return False;
 
        prs_debug(ps, depth, desc, "reg_io_r_open_entry");
        depth++;
 
-       prs_align(ps);
+       if(!prs_align(ps))
+               return False;
        
-       smb_io_pol_hnd("", &(r_r->pol), ps, depth);
+       if(!smb_io_pol_hnd("", &r_r->pol, ps, depth))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_r->status))
+               return False;
 
-       prs_uint32("status", ps, depth, &(r_r->status));
+       return True;
 }
 
+/*******************************************************************
+Inits a structure.
+********************************************************************/
+void init_reg_q_shutdown(REG_Q_SHUTDOWN * q_s,
+                        const char *msg, uint32 timeout, uint16 flags)
+{
+       int msg_len;
+       msg_len = strlen(msg);
+
+       q_s->ptr_0 = 1;
+       q_s->ptr_1 = 1;
+       q_s->ptr_2 = 1;
+
+       init_uni_hdr(&(q_s->hdr_msg), msg_len);
+       init_unistr2(&(q_s->uni_msg), msg, msg_len);
+
+       q_s->timeout = timeout;
+       q_s->flags = flags;
+
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL reg_io_q_shutdown(char *desc, REG_Q_SHUTDOWN * q_s, prs_struct *ps,
+                      int depth)
+{
+       if (q_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "reg_io_q_shutdown");
+       depth++;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_0", ps, depth, &(q_s->ptr_0)))
+               return False;
+       if (!prs_uint32("ptr_1", ps, depth, &(q_s->ptr_1)))
+               return False;
+       if (!prs_uint32("ptr_2", ps, depth, &(q_s->ptr_2)))
+               return False;
+
+       if (!smb_io_unihdr("hdr_msg", &(q_s->hdr_msg), ps, depth))
+               return False;
+       if (!smb_io_unistr2("uni_msg", &(q_s->uni_msg), q_s->hdr_msg.buffer, ps, depth))
+               return False;
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("timeout", ps, depth, &(q_s->timeout)))
+               return False;
+       if (!prs_uint16("flags  ", ps, depth, &(q_s->flags)))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL reg_io_r_shutdown(char *desc, REG_R_SHUTDOWN * r_s, prs_struct *ps,
+                      int depth)
+{
+       if (r_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "reg_io_r_shutdown");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_s->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+Inits a structure.
+********************************************************************/
+void init_reg_q_abort_shutdown(REG_Q_ABORT_SHUTDOWN * q_s)
+{
+
+       q_s->ptr_server = 0;
+
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL reg_io_q_abort_shutdown(char *desc, REG_Q_ABORT_SHUTDOWN * q_s,
+                            prs_struct *ps, int depth)
+{
+       if (q_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "reg_io_q_abort_shutdown");
+       depth++;
+
+       if (!prs_align(ps))
+               return False;
+
+       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;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL reg_io_r_abort_shutdown(char *desc, REG_R_ABORT_SHUTDOWN * r_s,
+                            prs_struct *ps, int depth)
+{
+       if (r_s == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "reg_io_r_abort_shutdown");
+       depth++;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_ntstatus("status", ps, depth, &r_s->status))
+               return False;
+
+       return True;
+}