This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...
[samba.git] / source3 / rpc_parse / parse_lsa.c
index d86df0ee113e96ca2cd7cb8784c0066af9fadce3..f960345fe74a2ea8fa95d9c7e7ebe928d909923c 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) Paul Ashton                       1997,
+ *  Copyright (C) Andrew Bartlett                   2002,
+ *  Copyright (C) Jim McDonough <jmcd@us.ibm.com>   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
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_PARSE
 
-static BOOL lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn, prs_struct *ps, int depth);
+static BOOL lsa_io_trans_names(const char *desc, LSA_TRANS_NAME_ENUM *trn, prs_struct *ps, int depth);
 
 /*******************************************************************
  Inits a LSA_TRANS_NAME structure.
 ********************************************************************/
 
 void init_lsa_trans_name(LSA_TRANS_NAME *trn, UNISTR2 *uni_name,
-                        uint16 sid_name_use, char *name, uint32 idx)
+                        uint16 sid_name_use, const char *name, uint32 idx)
 {
-       int len_name = strlen(name);
-
-       if(len_name == 0)
-               len_name = 1;
-
        trn->sid_name_use = sid_name_use;
-       init_uni_hdr(&trn->hdr_name, len_name);
-       init_unistr2(uni_name, name, len_name);
+       init_unistr2(uni_name, name, UNI_FLAGS_NONE);
+       init_uni_hdr(&trn->hdr_name, uni_name);
        trn->domain_idx = idx;
 }
 
@@ -49,7 +46,7 @@ void init_lsa_trans_name(LSA_TRANS_NAME *trn, UNISTR2 *uni_name,
  Reads or writes a LSA_TRANS_NAME structure.
 ********************************************************************/
 
-static BOOL lsa_io_trans_name(char *desc, LSA_TRANS_NAME *trn, prs_struct *ps, 
+static BOOL lsa_io_trans_name(const char *desc, LSA_TRANS_NAME *trn, prs_struct *ps, 
                              int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_trans_name");
@@ -75,10 +72,10 @@ static BOOL lsa_io_trans_name(char *desc, LSA_TRANS_NAME *trn, prs_struct *ps,
  Reads or writes a DOM_R_REF structure.
 ********************************************************************/
 
-static BOOL lsa_io_dom_r_ref(char *desc, DOM_R_REF *r_r, prs_struct *ps, 
+static BOOL lsa_io_dom_r_ref(const char *desc, DOM_R_REF *r_r, prs_struct *ps, 
                             int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "lsa_io_dom_r_ref");
        depth++;
@@ -140,8 +137,7 @@ static BOOL lsa_io_dom_r_ref(char *desc, DOM_R_REF *r_r, prs_struct *ps,
  Inits an LSA_SEC_QOS structure.
 ********************************************************************/
 
-void init_lsa_sec_qos(LSA_SEC_QOS *qos, uint16 imp_lev, uint8 ctxt, uint8 eff,
-                     uint32 unknown)
+void init_lsa_sec_qos(LSA_SEC_QOS *qos, uint16 imp_lev, uint8 ctxt, uint8 eff)
 {
        DEBUG(5, ("init_lsa_sec_qos\n"));
 
@@ -149,14 +145,13 @@ void init_lsa_sec_qos(LSA_SEC_QOS *qos, uint16 imp_lev, uint8 ctxt, uint8 eff,
        qos->sec_imp_level = imp_lev;
        qos->sec_ctxt_mode = ctxt;
        qos->effective_only = eff;
-       qos->unknown = unknown;
 }
 
 /*******************************************************************
  Reads or writes an LSA_SEC_QOS structure.
 ********************************************************************/
 
-static BOOL lsa_io_sec_qos(char *desc,  LSA_SEC_QOS *qos, prs_struct *ps, 
+static BOOL lsa_io_sec_qos(const char *desc,  LSA_SEC_QOS *qos, prs_struct *ps, 
                           int depth)
 {
        uint32 start;
@@ -180,13 +175,10 @@ static BOOL lsa_io_sec_qos(char *desc,  LSA_SEC_QOS *qos, prs_struct *ps,
                return False;
        if(!prs_uint8 ("effective_only", ps, depth, &qos->effective_only))
                return False;
-       if(!prs_uint32("unknown       ", ps, depth, &qos->unknown))
-               return False;
 
        if (qos->len != prs_offset(ps) - start) {
                DEBUG(3,("lsa_io_sec_qos: length %x does not match size %x\n",
                         qos->len, prs_offset(ps) - start));
-               return False;
        }
 
        return True;
@@ -196,7 +188,7 @@ static BOOL lsa_io_sec_qos(char *desc,  LSA_SEC_QOS *qos, prs_struct *ps,
  Inits an LSA_OBJ_ATTR structure.
 ********************************************************************/
 
-void init_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, LSA_SEC_QOS *qos)
+static void init_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, LSA_SEC_QOS *qos)
 {
        DEBUG(5, ("init_lsa_obj_attr\n"));
 
@@ -219,7 +211,7 @@ void init_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, LSA_SEC_QOS *qos)
  Reads or writes an LSA_OBJ_ATTR structure.
 ********************************************************************/
 
-static BOOL lsa_io_obj_attr(char *desc, LSA_OBJ_ATTR *attr, prs_struct *ps, 
+static BOOL lsa_io_obj_attr(const char *desc, LSA_OBJ_ATTR *attr, prs_struct *ps, 
                            int depth)
 {
        uint32 start;
@@ -248,13 +240,20 @@ static BOOL lsa_io_obj_attr(char *desc, LSA_OBJ_ATTR *attr, prs_struct *ps,
        if(!prs_uint32("ptr_sec_qos ", ps, depth, &attr->ptr_sec_qos )) /* security quality of service (pointer) */
                return False;
 
+       /* code commented out as it's not necessary true (tested with hyena). JFM, 11/22/2001 */
+#if 0
        if (attr->len != prs_offset(ps) - start) {
                DEBUG(3,("lsa_io_obj_attr: length %x does not match size %x\n",
                         attr->len, prs_offset(ps) - start));
                return False;
        }
+#endif
+
+       if (attr->ptr_sec_qos != 0) {
+               if (UNMARSHALLING(ps))
+                       if (!(attr->sec_qos = (LSA_SEC_QOS *)prs_alloc_mem(ps,sizeof(LSA_SEC_QOS))))
+                               return False;
 
-       if (attr->ptr_sec_qos != 0 && attr->sec_qos != NULL) {
                if(!lsa_io_sec_qos("sec_qos", attr->sec_qos, ps, depth))
                        return False;
        }
@@ -276,8 +275,7 @@ void init_q_open_pol(LSA_Q_OPEN_POL *r_q, uint16 system_name,
 
        r_q->ptr = 1; /* undocumented pointer */
 
-       if (qos == NULL)
-               r_q->des_access = desired_access;
+       r_q->des_access = desired_access;
 
        r_q->system_name = system_name;
        init_lsa_obj_attr(&r_q->attr, attributes, qos);
@@ -287,7 +285,7 @@ void init_q_open_pol(LSA_Q_OPEN_POL *r_q, uint16 system_name,
  Reads or writes an LSA_Q_OPEN_POL structure.
 ********************************************************************/
 
-BOOL lsa_io_q_open_pol(char *desc, LSA_Q_OPEN_POL *r_q, prs_struct *ps, 
+BOOL lsa_io_q_open_pol(const char *desc, LSA_Q_OPEN_POL *r_q, prs_struct *ps, 
                       int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_open_pol");
@@ -303,10 +301,8 @@ BOOL lsa_io_q_open_pol(char *desc, LSA_Q_OPEN_POL *r_q, prs_struct *ps,
        if(!lsa_io_obj_attr("", &r_q->attr, ps, depth))
                return False;
 
-       if (r_q->attr.ptr_sec_qos == 0) {
-               if(!prs_uint32("des_access", ps, depth, &r_q->des_access))
-                       return False;
-       }
+       if(!prs_uint32("des_access", ps, depth, &r_q->des_access))
+               return False;
 
        return True;
 }
@@ -315,7 +311,7 @@ BOOL lsa_io_q_open_pol(char *desc, LSA_Q_OPEN_POL *r_q, prs_struct *ps,
  Reads or writes an LSA_R_OPEN_POL structure.
 ********************************************************************/
 
-BOOL lsa_io_r_open_pol(char *desc, LSA_R_OPEN_POL *r_p, prs_struct *ps, 
+BOOL lsa_io_r_open_pol(const char *desc, LSA_R_OPEN_POL *r_p, prs_struct *ps, 
                       int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_open_pol");
@@ -324,7 +320,7 @@ BOOL lsa_io_r_open_pol(char *desc, LSA_R_OPEN_POL *r_p, prs_struct *ps,
        if(!smb_io_pol_hnd("", &r_p->pol, ps, depth))
                return False;
 
-       if(!prs_uint32("status", ps, depth, &r_p->status))
+       if(!prs_ntstatus("status", ps, depth, &r_p->status))
                return False;
 
        return True;
@@ -334,7 +330,7 @@ BOOL lsa_io_r_open_pol(char *desc, LSA_R_OPEN_POL *r_p, prs_struct *ps,
  Inits an LSA_Q_OPEN_POL2 structure.
 ********************************************************************/
 
-void init_q_open_pol2(LSA_Q_OPEN_POL2 *r_q, char *server_name,
+void init_q_open_pol2(LSA_Q_OPEN_POL2 *r_q, const char *server_name,
                        uint32 attributes, uint32 desired_access,
                        LSA_SEC_QOS *qos)
 {
@@ -343,11 +339,9 @@ void init_q_open_pol2(LSA_Q_OPEN_POL2 *r_q, char *server_name,
 
        r_q->ptr = 1; /* undocumented pointer */
 
-       if (qos == NULL)
-               r_q->des_access = desired_access;
+       r_q->des_access = desired_access;
 
-       init_unistr2(&r_q->uni_server_name, server_name, 
-                    strlen(server_name) + 1);
+       init_unistr2(&r_q->uni_server_name, server_name, UNI_STR_TERMINATE);
 
        init_lsa_obj_attr(&r_q->attr, attributes, qos);
 }
@@ -356,7 +350,7 @@ void init_q_open_pol2(LSA_Q_OPEN_POL2 *r_q, char *server_name,
  Reads or writes an LSA_Q_OPEN_POL2 structure.
 ********************************************************************/
 
-BOOL lsa_io_q_open_pol2(char *desc, LSA_Q_OPEN_POL2 *r_q, prs_struct *ps, 
+BOOL lsa_io_q_open_pol2(const char *desc, LSA_Q_OPEN_POL2 *r_q, prs_struct *ps, 
                        int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_open_pol2");
@@ -370,10 +364,8 @@ BOOL lsa_io_q_open_pol2(char *desc, LSA_Q_OPEN_POL2 *r_q, prs_struct *ps,
        if(!lsa_io_obj_attr("", &r_q->attr, ps, depth))
                return False;
 
-       if (r_q->attr.ptr_sec_qos == 0) {
-               if(!prs_uint32("des_access", ps, depth, &r_q->des_access))
-                       return False;
-       }
+       if(!prs_uint32("des_access", ps, depth, &r_q->des_access))
+               return False;
 
        return True;
 }
@@ -382,7 +374,7 @@ BOOL lsa_io_q_open_pol2(char *desc, LSA_Q_OPEN_POL2 *r_q, prs_struct *ps,
  Reads or writes an LSA_R_OPEN_POL2 structure.
 ********************************************************************/
 
-BOOL lsa_io_r_open_pol2(char *desc, LSA_R_OPEN_POL2 *r_p, prs_struct *ps, 
+BOOL lsa_io_r_open_pol2(const char *desc, LSA_R_OPEN_POL2 *r_p, prs_struct *ps, 
                        int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_open_pol2");
@@ -391,7 +383,7 @@ BOOL lsa_io_r_open_pol2(char *desc, LSA_R_OPEN_POL2 *r_p, prs_struct *ps,
        if(!smb_io_pol_hnd("", &r_p->pol, ps, depth))
                return False;
 
-       if(!prs_uint32("status", ps, depth, &r_p->status))
+       if(!prs_ntstatus("status", ps, depth, &r_p->status))
                return False;
 
        return True;
@@ -416,7 +408,7 @@ void init_q_query_sec_obj(LSA_Q_QUERY_SEC_OBJ *q_q, const POLICY_HND *hnd,
  Reads or writes an LSA_Q_QUERY_SEC_OBJ structure.
 ********************************************************************/
 
-BOOL lsa_io_q_query_sec_obj(char *desc, LSA_Q_QUERY_SEC_OBJ *q_q, 
+BOOL lsa_io_q_query_sec_obj(const char *desc, LSA_Q_QUERY_SEC_OBJ *q_q, 
                            prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_query_sec_obj");
@@ -435,7 +427,7 @@ BOOL lsa_io_q_query_sec_obj(char *desc, LSA_Q_QUERY_SEC_OBJ *q_q,
  Reads or writes a LSA_R_QUERY_SEC_OBJ structure.
 ********************************************************************/
 
-BOOL lsa_io_r_query_sec_obj(char *desc, LSA_R_QUERY_SEC_OBJ *r_u, 
+BOOL lsa_io_r_query_sec_obj(const char *desc, LSA_R_QUERY_SEC_OBJ *r_u, 
                            prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_query_sec_obj");
@@ -452,7 +444,7 @@ BOOL lsa_io_r_query_sec_obj(char *desc, LSA_R_QUERY_SEC_OBJ *r_u,
                        return False;
        }
 
-       if (!prs_uint32("status", ps, depth, &r_u->status))
+       if (!prs_ntstatus("status", ps, depth, &r_u->status))
                return False;
 
        return True;
@@ -475,7 +467,7 @@ void init_q_query(LSA_Q_QUERY_INFO *q_q, POLICY_HND *hnd, uint16 info_class)
  Reads or writes an LSA_Q_QUERY_INFO structure.
 ********************************************************************/
 
-BOOL lsa_io_q_query(char *desc, LSA_Q_QUERY_INFO *q_q, prs_struct *ps, 
+BOOL lsa_io_q_query(const char *desc, LSA_Q_QUERY_INFO *q_q, prs_struct *ps, 
                    int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_query");
@@ -509,7 +501,7 @@ BOOL init_q_enum_trust_dom(LSA_Q_ENUM_TRUST_DOM * q_e, POLICY_HND *pol,
  Reads or writes an LSA_Q_ENUM_TRUST_DOM structure.
 ********************************************************************/
 
-BOOL lsa_io_q_enum_trust_dom(char *desc, LSA_Q_ENUM_TRUST_DOM *q_e, 
+BOOL lsa_io_q_enum_trust_dom(const char *desc, LSA_Q_ENUM_TRUST_DOM *q_e, 
                             prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_enum_trust_dom");
@@ -530,47 +522,59 @@ BOOL lsa_io_q_enum_trust_dom(char *desc, LSA_Q_ENUM_TRUST_DOM *q_e,
  Inits an LSA_R_ENUM_TRUST_DOM structure.
 ********************************************************************/
 
-void init_r_enum_trust_dom(LSA_R_ENUM_TRUST_DOM *r_e, uint32 enum_context, 
-                          char *domain_name, DOM_SID *domain_sid,
-                           uint32 status)
+void init_r_enum_trust_dom(TALLOC_CTX *ctx, LSA_R_ENUM_TRUST_DOM *r_e, uint32 enum_context,
+                          uint32 req_num_domains, uint32 num_domains, TRUSTDOM **td)
 {
+       unsigned int i;
+
         DEBUG(5, ("init_r_enum_trust_dom\n"));
        
         r_e->enum_context = enum_context;
+       r_e->num_domains = num_domains;
+       r_e->ptr_enum_domains = 0;
+       r_e->num_domains2 = num_domains;
        
-        if (status == 0) {
-                int len_domain_name = strlen(domain_name) + 1;
-               
-                r_e->num_domains  = 1;
-                r_e->ptr_enum_domains = 1;
-                r_e->num_domains2 = 1;
-               
-               if (!(r_e->hdr_domain_name = (UNIHDR2 *)
-                     malloc(sizeof(UNIHDR2)))) return;
-
-               if (!(r_e->uni_domain_name = (UNISTR2 *)
-                     malloc(sizeof(UNISTR2)))) return;
-
-               if (!(r_e->domain_sid = (DOM_SID2 *)
-                     malloc(sizeof(DOM_SID2)))) return;
-
-               init_uni_hdr2(&r_e->hdr_domain_name[0], len_domain_name);
-               init_unistr2 (&r_e->uni_domain_name[0], domain_name, 
-                             len_domain_name);
-               init_dom_sid2(&r_e->domain_sid[0], domain_sid);
-        } else {
-                r_e->num_domains = 0;
-                r_e->ptr_enum_domains = 0;
-        }
+       if (num_domains != 0) {
        
-        r_e->status = status;
+               /* 
+                * allocating empty arrays of unicode headers, strings
+                * and sids of enumerated trusted domains
+                */
+               if (!(r_e->hdr_domain_name = (UNIHDR2 *)talloc(ctx,sizeof(UNIHDR2) * num_domains))) {
+                       r_e->status = NT_STATUS_NO_MEMORY;
+                       return;
+               }
+               
+               if (!(r_e->uni_domain_name = (UNISTR2 *)talloc(ctx,sizeof(UNISTR2) * num_domains))) {
+                       r_e->status = NT_STATUS_NO_MEMORY;
+                       return;
+               }
+
+               if (!(r_e->domain_sid = (DOM_SID2 *)talloc(ctx,sizeof(DOM_SID2) * num_domains))) {
+                       r_e->status = NT_STATUS_NO_MEMORY;
+                       return;
+               }
+                               
+               for (i = 0; i < num_domains; i++) {
+                       
+                       /* don't know what actually is this for */
+                       r_e->ptr_enum_domains = 1;
+                       
+                       init_dom_sid2(&r_e->domain_sid[i], &(td[i])->sid);
+                       
+                       init_unistr2_w(ctx, &r_e->uni_domain_name[i], (td[i])->name);
+                       init_uni_hdr2(&r_e->hdr_domain_name[i], &r_e->uni_domain_name[i]);
+                       
+               };
+       }
+
 }
 
 /*******************************************************************
  Reads or writes an LSA_R_ENUM_TRUST_DOM structure.
 ********************************************************************/
 
-BOOL lsa_io_r_enum_trust_dom(char *desc, LSA_R_ENUM_TRUST_DOM *r_e, 
+BOOL lsa_io_r_enum_trust_dom(const char *desc, LSA_R_ENUM_TRUST_DOM *r_e, 
                             prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_enum_trust_dom");
@@ -591,17 +595,16 @@ BOOL lsa_io_r_enum_trust_dom(char *desc, LSA_R_ENUM_TRUST_DOM *r_e,
 
                num_domains = r_e->num_domains2;
 
-               if (!(r_e->hdr_domain_name = (UNIHDR2 *)
-                     malloc(sizeof(UNIHDR2) * num_domains)))
-                       return False;
+               if (UNMARSHALLING(ps)) {
+                       if (!(r_e->hdr_domain_name = (UNIHDR2 *)prs_alloc_mem(ps,sizeof(UNIHDR2) * num_domains)))
+                               return False;
 
-               if (!(r_e->uni_domain_name = (UNISTR2 *)
-                     malloc(sizeof(UNISTR2) * num_domains)))
-                       return False;
+                       if (!(r_e->uni_domain_name = (UNISTR2 *)prs_alloc_mem(ps,sizeof(UNISTR2) * num_domains)))
+                               return False;
 
-               if (!(r_e->domain_sid = (DOM_SID2 *)
-                     malloc(sizeof(DOM_SID2) * num_domains)))
-                       return False;
+                       if (!(r_e->domain_sid = (DOM_SID2 *)prs_alloc_mem(ps,sizeof(DOM_SID2) * num_domains)))
+                               return False;
+               }
 
                for (i = 0; i < num_domains; i++) {
                        if(!smb_io_unihdr2 ("", &r_e->hdr_domain_name[i], ps, 
@@ -611,7 +614,7 @@ BOOL lsa_io_r_enum_trust_dom(char *desc, LSA_R_ENUM_TRUST_DOM *r_e,
                
                for (i = 0; i < num_domains; i++) {
                        if(!smb_io_unistr2 ("", &r_e->uni_domain_name[i],
-                                           r_e->hdr_domain_name[i].buffer, 
+                                           r_e->hdr_domain_name[i].buffer,
                                            ps, depth))
                                return False;
                        if(!smb_io_dom_sid2("", &r_e->domain_sid[i], ps, 
@@ -620,31 +623,17 @@ BOOL lsa_io_r_enum_trust_dom(char *desc, LSA_R_ENUM_TRUST_DOM *r_e,
                }
        }
 
-       if(!prs_uint32("status", ps, depth, &r_e->status))
+       if(!prs_ntstatus("status", ps, depth, &r_e->status))
                return False;
 
        return True;
 }
 
-void lsa_free_r_enum_trust_dom(LSA_R_ENUM_TRUST_DOM * r_e)
-{
-       safe_free(r_e->uni_domain_name);
-       safe_free(r_e->hdr_domain_name);
-       safe_free(r_e->domain_sid);
-
-       r_e->uni_domain_name = NULL;
-       r_e->hdr_domain_name = NULL;
-       r_e->domain_sid = NULL;
-
-       r_e->num_domains = 0;
-       r_e->ptr_enum_domains = 0;
-}
-
 /*******************************************************************
 reads or writes a dom query structure.
 ********************************************************************/
 
-static BOOL lsa_io_dom_query(char *desc, DOM_QUERY *d_q, prs_struct *ps, int depth)
+static BOOL lsa_io_dom_query(const char *desc, DOM_QUERY *d_q, prs_struct *ps, int depth)
 {
        if (d_q == NULL)
                return False;
@@ -685,7 +674,7 @@ static BOOL lsa_io_dom_query(char *desc, DOM_QUERY *d_q, prs_struct *ps, int dep
 reads or writes a structure.
 ********************************************************************/
 
-static BOOL lsa_io_dom_query_2(char *desc, DOM_QUERY_2 *d_q, prs_struct *ps, int depth)
+static BOOL lsa_io_dom_query_2(const char *desc, DOM_QUERY_2 *d_q, prs_struct *ps, int depth)
 {
        uint32 ptr = 1;
 
@@ -726,7 +715,7 @@ static BOOL lsa_io_dom_query_2(char *desc, DOM_QUERY_2 *d_q, prs_struct *ps, int
  Reads or writes a dom query structure.
 ********************************************************************/
 
-static BOOL lsa_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth)
+static BOOL lsa_io_dom_query_3(const char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth)
 {
        return lsa_io_dom_query("", d_q, ps, depth);
 }
@@ -735,7 +724,7 @@ static BOOL lsa_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int
  Reads or writes a dom query structure.
 ********************************************************************/
 
-BOOL lsa_io_dom_query_5(char *desc, DOM_QUERY_5 *d_q, prs_struct *ps, int depth)
+static BOOL lsa_io_dom_query_5(const char *desc, DOM_QUERY_5 *d_q, prs_struct *ps, int depth)
 {
        return lsa_io_dom_query("", d_q, ps, depth);
 }
@@ -744,7 +733,7 @@ BOOL lsa_io_dom_query_5(char *desc, DOM_QUERY_5 *d_q, prs_struct *ps, int depth)
  Reads or writes a dom query structure.
 ********************************************************************/
 
-static BOOL lsa_io_dom_query_6(char *desc, DOM_QUERY_6 *d_q, prs_struct *ps, int depth)
+static BOOL lsa_io_dom_query_6(const char *desc, DOM_QUERY_6 *d_q, prs_struct *ps, int depth)
 {
        if (d_q == NULL)
                return False;
@@ -759,10 +748,10 @@ static BOOL lsa_io_dom_query_6(char *desc, DOM_QUERY_6 *d_q, prs_struct *ps, int
 }
 
 /*******************************************************************
- Reads or writes an LSA_Q_QUERY_INFO structure.
+ Reads or writes an LSA_R_QUERY_INFO structure.
 ********************************************************************/
 
-BOOL lsa_io_r_query(char *desc, LSA_R_QUERY_INFO *r_q, prs_struct *ps,
+BOOL lsa_io_r_query(const char *desc, LSA_R_QUERY_INFO *r_q, prs_struct *ps,
                    int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_query");
@@ -804,7 +793,7 @@ BOOL lsa_io_r_query(char *desc, LSA_R_QUERY_INFO *r_q, prs_struct *ps,
        if(!prs_align(ps))
                return False;
 
-       if(!prs_uint32("status", ps, depth, &r_q->status))
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
                return False;
 
        return True;
@@ -814,7 +803,7 @@ BOOL lsa_io_r_query(char *desc, LSA_R_QUERY_INFO *r_q, prs_struct *ps,
  Inits a LSA_SID_ENUM structure.
 ********************************************************************/
 
-void init_lsa_sid_enum(TALLOC_CTX *mem_ctx, LSA_SID_ENUM *sen, 
+static void init_lsa_sid_enum(TALLOC_CTX *mem_ctx, LSA_SID_ENUM *sen, 
                       int num_entries, DOM_SID *sids)
 {
        int i;
@@ -853,10 +842,10 @@ void init_lsa_sid_enum(TALLOC_CTX *mem_ctx, LSA_SID_ENUM *sen,
  Reads or writes a LSA_SID_ENUM structure.
 ********************************************************************/
 
-static BOOL lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps, 
+static BOOL lsa_io_sid_enum(const char *desc, LSA_SID_ENUM *sen, prs_struct *ps, 
                            int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "lsa_io_sid_enum");
        depth++;
@@ -868,6 +857,15 @@ static BOOL lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps,
                return False;
        if(!prs_uint32("ptr_sid_enum", ps, depth, &sen->ptr_sid_enum))
                return False;
+
+       /*
+          if the ptr is NULL, leave here. checked from a real w2k trace.
+          JFM, 11/23/2001
+        */
+       
+       if (sen->ptr_sid_enum==0)
+               return True;
+
        if(!prs_uint32("num_entries2", ps, depth, &sen->num_entries2))
                return False;
 
@@ -918,7 +916,7 @@ void init_q_lookup_sids(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_SIDS *q_l,
                        POLICY_HND *hnd, int num_sids, DOM_SID *sids,
                        uint16 level)
 {
-       DEBUG(5, ("init_r_enum_trust_dom\n"));
+       DEBUG(5, ("init_q_lookup_sids\n"));
 
        ZERO_STRUCTP(q_l);
 
@@ -932,7 +930,7 @@ void init_q_lookup_sids(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_SIDS *q_l,
  Reads or writes a LSA_Q_LOOKUP_SIDS structure.
 ********************************************************************/
 
-BOOL lsa_io_q_lookup_sids(char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *ps,
+BOOL lsa_io_q_lookup_sids(const char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *ps,
                          int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_lookup_sids");
@@ -960,10 +958,10 @@ BOOL lsa_io_q_lookup_sids(char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *ps,
  Reads or writes a structure.
 ********************************************************************/
 
-static BOOL lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn,
+static BOOL lsa_io_trans_names(const char *desc, LSA_TRANS_NAME_ENUM *trn,
                 prs_struct *ps, int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "lsa_io_trans_names");
        depth++;
@@ -1021,7 +1019,7 @@ static BOOL lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn,
  Reads or writes a structure.
 ********************************************************************/
 
-BOOL lsa_io_r_lookup_sids(char *desc, LSA_R_LOOKUP_SIDS *r_s, 
+BOOL lsa_io_r_lookup_sids(const char *desc, LSA_R_LOOKUP_SIDS *r_s, 
                          prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_lookup_sids");
@@ -1046,7 +1044,7 @@ BOOL lsa_io_r_lookup_sids(char *desc, LSA_R_LOOKUP_SIDS *r_s,
        if(!prs_uint32("mapped_count", ps, depth, &r_s->mapped_count))
                return False;
 
-       if(!prs_uint32("status      ", ps, depth, &r_s->status))
+       if(!prs_ntstatus("status      ", ps, depth, &r_s->status))
                return False;
 
        return True;
@@ -1057,9 +1055,9 @@ makes a structure.
 ********************************************************************/
 
 void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l, 
-                        POLICY_HND *hnd, int num_names, char **names)
+                        POLICY_HND *hnd, int num_names, const char **names)
 {
-       int i;
+       unsigned int i;
 
        DEBUG(5, ("init_q_lookup_names\n"));
 
@@ -1083,11 +1081,8 @@ void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l,
        }
 
        for (i = 0; i < num_names; i++) {
-               char* name = names[i];
-               int len = strlen(name);
-
-               init_uni_hdr(&q_l->hdr_name[i], len);
-               init_unistr2(&q_l->uni_name[i], name, len);
+               init_unistr2(&q_l->uni_name[i], names[i], UNI_FLAGS_NONE);
+               init_uni_hdr(&q_l->hdr_name[i], &q_l->uni_name[i]);
        }
 }
 
@@ -1095,10 +1090,10 @@ void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l,
 reads or writes a structure.
 ********************************************************************/
 
-BOOL lsa_io_q_lookup_names(char *desc, LSA_Q_LOOKUP_NAMES *q_r, 
+BOOL lsa_io_q_lookup_names(const char *desc, LSA_Q_LOOKUP_NAMES *q_r, 
                           prs_struct *ps, int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "lsa_io_q_lookup_names");
        depth++;
@@ -1159,10 +1154,10 @@ BOOL lsa_io_q_lookup_names(char *desc, LSA_Q_LOOKUP_NAMES *q_r,
 reads or writes a structure.
 ********************************************************************/
 
-BOOL lsa_io_r_lookup_names(char *desc, LSA_R_LOOKUP_NAMES *r_r, 
+BOOL lsa_io_r_lookup_names(const char *desc, LSA_R_LOOKUP_NAMES *r_r, 
                           prs_struct *ps, int depth)
 {
-       int i;
+       unsigned int i;
 
        prs_debug(ps, depth, desc, "lsa_io_r_lookup_names");
        depth++;
@@ -1207,7 +1202,7 @@ BOOL lsa_io_r_lookup_names(char *desc, LSA_R_LOOKUP_NAMES *r_r,
        if(!prs_uint32("mapped_count", ps, depth, &r_r->mapped_count))
                return False;
 
-       if(!prs_uint32("status      ", ps, depth, &r_r->status))
+       if(!prs_ntstatus("status      ", ps, depth, &r_r->status))
                return False;
 
        return True;
@@ -1229,7 +1224,7 @@ void init_lsa_q_close(LSA_Q_CLOSE *q_c, POLICY_HND *hnd)
  Reads or writes an LSA_Q_CLOSE structure.
 ********************************************************************/
 
-BOOL lsa_io_q_close(char *desc, LSA_Q_CLOSE *q_c, prs_struct *ps, int depth)
+BOOL lsa_io_q_close(const char *desc, LSA_Q_CLOSE *q_c, prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_close");
        depth++;
@@ -1244,7 +1239,7 @@ BOOL lsa_io_q_close(char *desc, LSA_Q_CLOSE *q_c, prs_struct *ps, int depth)
  Reads or writes an LSA_R_CLOSE structure.
 ********************************************************************/
 
-BOOL lsa_io_r_close(char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
+BOOL lsa_io_r_close(const char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_close");
        depth++;
@@ -1252,7 +1247,7 @@ BOOL lsa_io_r_close(char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
        if(!smb_io_pol_hnd("", &r_c->pol, ps, depth))
                return False;
 
-       if(!prs_uint32("status", ps, depth, &r_c->status))
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
                return False;
 
        return True;
@@ -1262,7 +1257,7 @@ BOOL lsa_io_r_close(char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
  Reads or writes an LSA_Q_OPEN_SECRET structure.
 ********************************************************************/
 
-BOOL lsa_io_q_open_secret(char *desc, LSA_Q_OPEN_SECRET *q_c, prs_struct *ps, int depth)
+BOOL lsa_io_q_open_secret(const char *desc, LSA_Q_OPEN_SECRET *q_c, prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_q_open_secret");
        depth++;
@@ -1275,7 +1270,7 @@ BOOL lsa_io_q_open_secret(char *desc, LSA_Q_OPEN_SECRET *q_c, prs_struct *ps, in
  Reads or writes an LSA_R_OPEN_SECRET structure.
 ********************************************************************/
 
-BOOL lsa_io_r_open_secret(char *desc, LSA_R_OPEN_SECRET *r_c, prs_struct *ps, int depth)
+BOOL lsa_io_r_open_secret(const char *desc, LSA_R_OPEN_SECRET *r_c, prs_struct *ps, int depth)
 {
        prs_debug(ps, depth, desc, "lsa_io_r_open_secret");
        depth++;
@@ -1291,7 +1286,1131 @@ BOOL lsa_io_r_open_secret(char *desc, LSA_R_OPEN_SECRET *r_c, prs_struct *ps, in
                return False;
        if(!prs_uint32("dummy4", ps, depth, &r_c->dummy4))
                return False;
-       if(!prs_uint32("status", ps, depth, &r_c->status))
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an LSA_Q_ENUM_PRIVS structure.
+********************************************************************/
+
+void init_q_enum_privs(LSA_Q_ENUM_PRIVS *q_q, POLICY_HND *hnd, uint32 enum_context, uint32 pref_max_length)
+{
+       DEBUG(5, ("init_q_enum_privs\n"));
+
+       memcpy(&q_q->pol, hnd, sizeof(q_q->pol));
+
+       q_q->enum_context = enum_context;
+       q_q->pref_max_length = pref_max_length;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_q_enum_privs(const char *desc, LSA_Q_ENUM_PRIVS *q_q, prs_struct *ps, int depth)
+{
+       if (q_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_enum_privs");
+       depth++;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if(!prs_uint32("enum_context   ", ps, depth, &q_q->enum_context))
+               return False;
+       if(!prs_uint32("pref_max_length", ps, depth, &q_q->pref_max_length))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+static BOOL lsa_io_priv_entries(const char *desc, LSA_PRIV_ENTRY *entries, uint32 count, prs_struct *ps, int depth)
+{
+       uint32 i;
+
+       if (entries == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_priv_entries");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       for (i = 0; i < count; i++) {
+               if (!smb_io_unihdr("", &entries[i].hdr_name, ps, depth))
+                       return False;
+               if(!prs_uint32("luid_low ", ps, depth, &entries[i].luid_low))
+                       return False;
+               if(!prs_uint32("luid_high", ps, depth, &entries[i].luid_high))
+                       return False;
+       }
+
+       for (i = 0; i < count; i++)
+               if (!smb_io_unistr2("", &entries[i].name, entries[i].hdr_name.buffer, ps, depth))
+                       return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Inits an LSA_R_ENUM_PRIVS structure.
+********************************************************************/
+
+void init_lsa_r_enum_privs(LSA_R_ENUM_PRIVS *r_u, uint32 enum_context,
+                         uint32 count, LSA_PRIV_ENTRY *entries)
+{
+       DEBUG(5, ("init_lsa_r_enum_privs\n"));
+
+       r_u->enum_context=enum_context;
+       r_u->count=count;
+       
+       if (entries!=NULL) {
+               r_u->ptr=1;
+               r_u->count1=count;
+               r_u->privs=entries;
+       } else {
+               r_u->ptr=0;
+               r_u->count1=0;
+               r_u->privs=NULL;
+       }               
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_r_enum_privs(const char *desc, LSA_R_ENUM_PRIVS *r_q, prs_struct *ps, int depth)
+{
+       if (r_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_enum_privs");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("enum_context", ps, depth, &r_q->enum_context))
+               return False;
+       if(!prs_uint32("count", ps, depth, &r_q->count))
+               return False;
+       if(!prs_uint32("ptr", ps, depth, &r_q->ptr))
+               return False;
+
+       if (r_q->ptr) {
+               if(!prs_uint32("count1", ps, depth, &r_q->count1))
+                       return False;
+
+               if (UNMARSHALLING(ps))
+                       if (!(r_q->privs = (LSA_PRIV_ENTRY *)prs_alloc_mem(ps, sizeof(LSA_PRIV_ENTRY) * r_q->count1)))
+                               return False;
+
+               if (!lsa_io_priv_entries("", r_q->privs, r_q->count1, ps, depth))
+                       return False;
+       }
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
+
+       return True;
+}
+
+void init_lsa_priv_get_dispname(LSA_Q_PRIV_GET_DISPNAME *trn, POLICY_HND *hnd, const char *name, uint16 lang_id, uint16 lang_id_sys)
+{
+       memcpy(&trn->pol, hnd, sizeof(trn->pol));
+
+       init_unistr2(&trn->name, name, UNI_FLAGS_NONE);
+       init_uni_hdr(&trn->hdr_name, &trn->name);
+       trn->lang_id = lang_id;
+       trn->lang_id_sys = lang_id_sys;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_q_priv_get_dispname(const char *desc, LSA_Q_PRIV_GET_DISPNAME *q_q, prs_struct *ps, int depth)
+{
+       if (q_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_priv_get_dispname");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if (!smb_io_unihdr("hdr_name", &q_q->hdr_name, ps, depth))
+               return False;
+
+       if (!smb_io_unistr2("name", &q_q->name, q_q->hdr_name.buffer, ps, depth))
+               return False;
+
+       if(!prs_uint16("lang_id    ", ps, depth, &q_q->lang_id))
+               return False;
+       if(!prs_uint16("lang_id_sys", ps, depth, &q_q->lang_id_sys))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_r_priv_get_dispname(const char *desc, LSA_R_PRIV_GET_DISPNAME *r_q, prs_struct *ps, int depth)
+{
+       if (r_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_priv_get_dispname");
+       depth++;
+
+       if (!prs_align(ps))
+               return False;
+
+       if (!prs_uint32("ptr_info", ps, depth, &r_q->ptr_info))
+               return False;
+
+       if (r_q->ptr_info){
+               if (!smb_io_unihdr("hdr_name", &r_q->hdr_desc, ps, depth))
+                       return False;
+
+               if (!smb_io_unistr2("desc", &r_q->desc, r_q->hdr_desc.buffer, ps, depth))
+                       return False;
+       }
+/*
+       if(!prs_align(ps))
+               return False;
+*/
+       if(!prs_uint16("lang_id", ps, depth, &r_q->lang_id))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
+
+       return True;
+}
+
+/*
+  initialise a LSA_Q_ENUM_ACCOUNTS structure
+*/
+void init_lsa_q_enum_accounts(LSA_Q_ENUM_ACCOUNTS *trn, POLICY_HND *hnd, uint32 enum_context, uint32 pref_max_length)
+{
+       memcpy(&trn->pol, hnd, sizeof(trn->pol));
+
+       trn->enum_context = enum_context;
+       trn->pref_max_length = pref_max_length;
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_q_enum_accounts(const char *desc, LSA_Q_ENUM_ACCOUNTS *q_q, prs_struct *ps, int depth)
+{
+       if (q_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_enum_accounts");
+       depth++;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if(!prs_uint32("enum_context   ", ps, depth, &q_q->enum_context))
+               return False;
+       if(!prs_uint32("pref_max_length", ps, depth, &q_q->pref_max_length))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits an LSA_R_ENUM_PRIVS structure.
+********************************************************************/
+
+void init_lsa_r_enum_accounts(LSA_R_ENUM_ACCOUNTS *r_u, uint32 enum_context)
+{
+       DEBUG(5, ("init_lsa_r_enum_accounts\n"));
+
+       r_u->enum_context=enum_context;
+       if (r_u->enum_context!=0) {
+               r_u->sids.num_entries=enum_context;
+               r_u->sids.ptr_sid_enum=1;
+               r_u->sids.num_entries2=enum_context;
+       } else {
+               r_u->sids.num_entries=0;
+               r_u->sids.ptr_sid_enum=0;
+               r_u->sids.num_entries2=0;
+       }
+}
+
+/*******************************************************************
+reads or writes a structure.
+********************************************************************/
+BOOL lsa_io_r_enum_accounts(const char *desc, LSA_R_ENUM_ACCOUNTS *r_q, prs_struct *ps, int depth)
+{
+       if (r_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_enum_accounts");
+       depth++;
+
+       if (!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("enum_context", ps, depth, &r_q->enum_context))
+               return False;
+
+       if (!lsa_io_sid_enum("sids", &r_q->sids, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_q->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Reads or writes an LSA_Q_UNK_GET_CONNUSER structure.
+********************************************************************/
+
+BOOL lsa_io_q_unk_get_connuser(const char *desc, LSA_Q_UNK_GET_CONNUSER *q_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_unk_get_connuser");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+   
+       if(!prs_uint32("ptr_srvname", ps, depth, &q_c->ptr_srvname))
+               return False;
+
+       if(!smb_io_unistr2("uni2_srvname", &q_c->uni2_srvname, q_c->ptr_srvname, ps, depth)) /* server name to be looked up */
+               return False;
+
+       if (!prs_align(ps))
+         return False;
+
+       if(!prs_uint32("unk1", ps, depth, &q_c->unk1))
+               return False;
+       if(!prs_uint32("unk2", ps, depth, &q_c->unk2))
+               return False;
+       if(!prs_uint32("unk3", ps, depth, &q_c->unk3))
+               return False;
+
+       /* Don't bother to read or write at present... */
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_UNK_GET_CONNUSER structure.
+********************************************************************/
+
+BOOL lsa_io_r_unk_get_connuser(const char *desc, LSA_R_UNK_GET_CONNUSER *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_unk_get_connuser");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+   
+       if(!prs_uint32("ptr_user_name", ps, depth, &r_c->ptr_user_name))
+               return False;
+       if(!smb_io_unihdr("hdr_user_name", &r_c->hdr_user_name, ps, depth))
+               return False;
+       if(!smb_io_unistr2("uni2_user_name", &r_c->uni2_user_name, r_c->ptr_user_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+         return False;
+       
+       if(!prs_uint32("unk1", ps, depth, &r_c->unk1))
+               return False;
+
+       if(!prs_uint32("ptr_dom_name", ps, depth, &r_c->ptr_dom_name))
+               return False;
+       if(!smb_io_unihdr("hdr_dom_name", &r_c->hdr_dom_name, ps, depth))
+               return False;
+       if(!smb_io_unistr2("uni2_dom_name", &r_c->uni2_dom_name, r_c->ptr_dom_name, ps, depth))
+               return False;
+
+       if (!prs_align(ps))
+         return False;
+       
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+void init_lsa_q_open_account(LSA_Q_OPENACCOUNT *trn, POLICY_HND *hnd, DOM_SID *sid, uint32 desired_access)
+{
+       memcpy(&trn->pol, hnd, sizeof(trn->pol));
+
+       init_dom_sid2(&trn->sid, sid);
+       trn->access = desired_access;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_Q_OPENACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_q_open_account(const char *desc, LSA_Q_OPENACCOUNT *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_open_account");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &r_c->sid, ps, depth)) /* domain SID */
+               return False;
+
+       if(!prs_uint32("access", ps, depth, &r_c->access))
+               return False;
+  
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_OPENACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_r_open_account(const char *desc, LSA_R_OPENACCOUNT  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_open_account");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+void init_lsa_q_enum_privsaccount(LSA_Q_ENUMPRIVSACCOUNT *trn, POLICY_HND *hnd)
+{
+       memcpy(&trn->pol, hnd, sizeof(trn->pol));
+
+}
+
+/*******************************************************************
+ Reads or writes an LSA_Q_ENUMPRIVSACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_q_enum_privsaccount(const char *desc, LSA_Q_ENUMPRIVSACCOUNT *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_enum_privsaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LUID structure.
+********************************************************************/
+
+static BOOL lsa_io_luid(const char *desc, LUID *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_luid");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("low", ps, depth, &r_c->low))
+               return False;
+
+       if(!prs_uint32("high", ps, depth, &r_c->high))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LUID_ATTR structure.
+********************************************************************/
+
+static BOOL lsa_io_luid_attr(const char *desc, LUID_ATTR *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_luid_attr");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if (!lsa_io_luid(desc, &r_c->luid, ps, depth))
+               return False;
+
+       if(!prs_uint32("attr", ps, depth, &r_c->attr))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an PRIVILEGE_SET structure.
+********************************************************************/
+
+static BOOL lsa_io_privilege_set(const char *desc, PRIVILEGE_SET *r_c, prs_struct *ps, int depth)
+{
+       uint32 i;
+
+       prs_debug(ps, depth, desc, "lsa_io_privilege_set");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("count", ps, depth, &r_c->count))
+               return False;
+       if(!prs_uint32("control", ps, depth, &r_c->control))
+               return False;
+
+       for (i=0; i<r_c->count; i++) {
+               if (!lsa_io_luid_attr(desc, &r_c->set[i], ps, depth))
+                       return False;
+       }
+       
+       return True;
+}
+
+NTSTATUS init_lsa_r_enum_privsaccount(TALLOC_CTX *mem_ctx, LSA_R_ENUMPRIVSACCOUNT *r_u, LUID_ATTR *set, uint32 count, uint32 control)
+{
+       NTSTATUS ret = NT_STATUS_OK;
+
+       r_u->ptr = 1;
+       r_u->count = count;
+
+       if (!NT_STATUS_IS_OK(ret = init_priv_with_ctx(mem_ctx, &(r_u->set))))
+               return ret;
+       
+       if (!NT_STATUS_IS_OK(ret = dupalloc_luid_attr(r_u->set->mem_ctx, &(r_u->set->set), set)))
+               return ret;
+
+       DEBUG(10,("init_lsa_r_enum_privsaccount: %d %d privileges\n", r_u->count, r_u->set->count));
+
+       return ret;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_ENUMPRIVSACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_r_enum_privsaccount(const char *desc, LSA_R_ENUMPRIVSACCOUNT *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_enum_privsaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("ptr", ps, depth, &r_c->ptr))
+               return False;
+
+       if (r_c->ptr!=0) {
+               if(!prs_uint32("count", ps, depth, &r_c->count))
+                       return False;
+
+               /* malloc memory if unmarshalling here */
+
+               if (UNMARSHALLING(ps) && r_c->count != 0) {
+                       if (!NT_STATUS_IS_OK(init_priv_with_ctx(ps->mem_ctx, &(r_c->set))))
+                               return False;
+
+                       if (!(r_c->set->set = (LUID_ATTR *)prs_alloc_mem(ps,sizeof(LUID_ATTR) * r_c->count)))
+                               return False;
+
+               }
+               
+               if(!lsa_io_privilege_set(desc, r_c->set, ps, depth))
+                       return False;
+       }
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+
+/*******************************************************************
+ Reads or writes an  LSA_Q_GETSYSTEMACCOUNTstructure.
+********************************************************************/
+
+BOOL lsa_io_q_getsystemaccount(const char *desc, LSA_Q_GETSYSTEMACCOUNT  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_getsystemaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an  LSA_R_GETSYSTEMACCOUNTstructure.
+********************************************************************/
+
+BOOL lsa_io_r_getsystemaccount(const char *desc, LSA_R_GETSYSTEMACCOUNT  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_getsystemaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("access", ps, depth, &r_c->access))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Reads or writes an LSA_Q_SETSYSTEMACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_q_setsystemaccount(const char *desc, LSA_Q_SETSYSTEMACCOUNT  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_setsystemaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+
+       if(!prs_uint32("access", ps, depth, &r_c->access))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_SETSYSTEMACCOUNT structure.
+********************************************************************/
+
+BOOL lsa_io_r_setsystemaccount(const char *desc, LSA_R_SETSYSTEMACCOUNT  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_setsystemaccount");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+void init_lsa_q_lookupprivvalue(LSA_Q_LOOKUPPRIVVALUE *trn, POLICY_HND *hnd, const char *name)
+{
+       memcpy(&trn->pol, hnd, sizeof(trn->pol));
+       init_unistr2(&trn->uni2_right, name, UNI_FLAGS_NONE);
+       init_uni_hdr(&trn->hdr_right, &trn->uni2_right);
+}
+
+/*******************************************************************
+ Reads or writes an LSA_Q_LOOKUPPRIVVALUE  structure.
+********************************************************************/
+
+BOOL lsa_io_q_lookupprivvalue(const char *desc, LSA_Q_LOOKUPPRIVVALUE  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_lookupprivvalue");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+       if(!smb_io_unihdr ("hdr_name", &r_c->hdr_right, ps, depth))
+               return False;
+       if(!smb_io_unistr2("uni2_right", &r_c->uni2_right, r_c->hdr_right.buffer, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an  LSA_R_LOOKUPPRIVVALUE structure.
+********************************************************************/
+
+BOOL lsa_io_r_lookupprivvalue(const char *desc, LSA_R_LOOKUPPRIVVALUE  *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_lookupprivvalue");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+               
+       if(!lsa_io_luid("luid", &r_c->luid, ps, depth))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Reads or writes an LSA_Q_ADDPRIVS structure.
+********************************************************************/
+
+BOOL lsa_io_q_addprivs(const char *desc, LSA_Q_ADDPRIVS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_addprivs");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+       
+       if(!prs_uint32("count", ps, depth, &r_c->count))
+               return False;
+
+       if (UNMARSHALLING(ps) && r_c->count!=0) {
+               if (!NT_STATUS_IS_OK(init_priv_with_ctx(ps->mem_ctx, &(r_c->set))))
+                       return False;
+               
+               if (!(r_c->set->set = (LUID_ATTR *)prs_alloc_mem(ps, sizeof(LUID_ATTR) * r_c->count)))
+                       return False;
+       }
+       
+       if(!lsa_io_privilege_set(desc, r_c->set, ps, depth))
+               return False;
+       
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_ADDPRIVS structure.
+********************************************************************/
+
+BOOL lsa_io_r_addprivs(const char *desc, LSA_R_ADDPRIVS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_addprivs");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_Q_REMOVEPRIVS structure.
+********************************************************************/
+
+BOOL lsa_io_q_removeprivs(const char *desc, LSA_Q_REMOVEPRIVS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_removeprivs");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &r_c->pol, ps, depth))
+               return False;
+       
+       if(!prs_uint32("allrights", ps, depth, &r_c->allrights))
+               return False;
+
+       if(!prs_uint32("ptr", ps, depth, &r_c->ptr))
+               return False;
+
+       /* 
+        * JFM: I'm not sure at all if the count is inside the ptr
+        * never seen one with ptr=0
+        */
+
+       if (r_c->ptr!=0) {
+               if(!prs_uint32("count", ps, depth, &r_c->count))
+                       return False;
+
+               if (UNMARSHALLING(ps) && r_c->count!=0) {
+                       if (!NT_STATUS_IS_OK(init_priv_with_ctx(ps->mem_ctx, &(r_c->set))))
+                               return False;
+
+                       if (!(r_c->set->set = (LUID_ATTR *)prs_alloc_mem(ps, sizeof(LUID_ATTR) * r_c->count)))
+                               return False;
+               }
+
+               if(!lsa_io_privilege_set(desc, r_c->set, ps, depth))
+                       return False;
+       }
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_REMOVEPRIVS structure.
+********************************************************************/
+
+BOOL lsa_io_r_removeprivs(const char *desc, LSA_R_REMOVEPRIVS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_removeprivs");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+BOOL policy_handle_is_valid(const POLICY_HND *hnd)
+{
+       POLICY_HND zero_pol;
+
+       ZERO_STRUCT(zero_pol);
+       return ((memcmp(&zero_pol, hnd, sizeof(POLICY_HND)) == 0) ? False : True );
+}
+
+/*******************************************************************
+ Reads or writes an LSA_DNS_DOM_INFO structure.
+********************************************************************/
+
+BOOL lsa_io_dns_dom_info(const char *desc, LSA_DNS_DOM_INFO *info,
+                        prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_dns_dom_info");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_unihdr("nb_name", &info->hdr_nb_dom_name, ps, depth))
+               return False;
+       if(!smb_io_unihdr("dns_name", &info->hdr_dns_dom_name, ps, depth))
+               return False;
+       if(!smb_io_unihdr("forest", &info->hdr_forest_name, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+       if (!prs_uint8s(False, "dom_guid", ps, depth, info->dom_guid.info, GUID_SIZE))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_uint32("dom_sid", ps, depth, &info->ptr_dom_sid))
+               return False;
+
+       if(!smb_io_unistr2("nb_name", &info->uni_nb_dom_name,
+                          info->hdr_nb_dom_name.buffer, ps, depth))
+               return False;
+       if(!smb_io_unistr2("dns_name", &info->uni_dns_dom_name, 
+                          info->hdr_dns_dom_name.buffer, ps, depth))
+               return False;
+       if(!smb_io_unistr2("forest", &info->uni_forest_name, 
+                          info->hdr_forest_name.buffer, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("dom_sid", &info->dom_sid, ps, depth))
+               return False;
+
+       return True;
+       
+}
+
+/*******************************************************************
+ Inits an LSA_Q_QUERY_INFO2 structure.
+********************************************************************/
+
+void init_q_query2(LSA_Q_QUERY_INFO2 *q_q, POLICY_HND *hnd, uint16 info_class)
+{
+       DEBUG(5, ("init_q_query2\n"));
+
+       memcpy(&q_q->pol, hnd, sizeof(q_q->pol));
+
+       q_q->info_class = info_class;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_Q_QUERY_DNSDOMINFO structure.
+********************************************************************/
+
+BOOL lsa_io_q_query_info2(const char *desc, LSA_Q_QUERY_INFO2 *q_c,
+                         prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_query_info2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+       if(!smb_io_pol_hnd("pol", &q_c->pol, ps, depth))
+               return False;
+       
+       if(!prs_uint16("info_class", ps, depth, &q_c->info_class))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+ Reads or writes an LSA_R_QUERY_DNSDOMINFO structure.
+********************************************************************/
+
+BOOL lsa_io_r_query_info2(const char *desc, LSA_R_QUERY_INFO2 *r_c,
+                         prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_query_info2");
+       depth++;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_uint32("ptr", ps, depth, &r_c->ptr))
+               return False;
+       if(!prs_uint16("info_class", ps, depth, &r_c->info_class))
+               return False;
+       switch(r_c->info_class) {
+       case 0x000c:
+               if (!lsa_io_dns_dom_info("info12", &r_c->info.dns_dom_info,
+                                        ps, depth))
+                       return False;
+               break;
+       default:
+               DEBUG(0,("lsa_io_r_query_info2: unknown info class %d\n",
+                        r_c->info_class));
+               return False;
+       }
+
+       if(!prs_align(ps))
+               return False;
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits an LSA_Q_ENUM_ACCT_RIGHTS structure.
+********************************************************************/
+void init_q_enum_acct_rights(LSA_Q_ENUM_ACCT_RIGHTS *q_q, 
+                            POLICY_HND *hnd, 
+                            uint32 count, 
+                            DOM_SID *sid)
+{
+       DEBUG(5, ("init_q_enum_acct_rights\n"));
+
+       q_q->pol = *hnd;
+       init_dom_sid2(&q_q->sid, sid);
+}
+
+/*******************************************************************
+reads or writes a LSA_Q_ENUM_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_q_enum_acct_rights(const char *desc, LSA_Q_ENUM_ACCT_RIGHTS *q_q, prs_struct *ps, int depth)
+{
+       
+       if (q_q == NULL)
+               return False;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_enum_acct_rights");
+       depth++;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &q_q->sid, ps, depth))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+reads or writes a LSA_R_ENUM_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_r_enum_acct_rights(const char *desc, LSA_R_ENUM_ACCT_RIGHTS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_enum_acct_rights");
+       depth++;
+
+       if(!prs_uint32("count   ", ps, depth, &r_c->count))
+               return False;
+
+       if(!smb_io_unistr2_array("rights", &r_c->rights, ps, depth))
+               return False;
+
+       if(!prs_align(ps))
+               return False;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits an LSA_Q_ADD_ACCT_RIGHTS structure.
+********************************************************************/
+void init_q_add_acct_rights(LSA_Q_ADD_ACCT_RIGHTS *q_q, 
+                           POLICY_HND *hnd, 
+                           DOM_SID *sid,
+                           uint32 count, 
+                           const char **rights)
+{
+       DEBUG(5, ("init_q_add_acct_rights\n"));
+
+       q_q->pol = *hnd;
+       init_dom_sid2(&q_q->sid, sid);
+       init_unistr2_array(&q_q->rights, count, rights);
+       q_q->count = 5;
+}
+
+
+/*******************************************************************
+reads or writes a LSA_Q_ADD_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_q_add_acct_rights(const char *desc, LSA_Q_ADD_ACCT_RIGHTS *q_q, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_add_acct_rights");
+       depth++;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &q_q->sid, ps, depth))
+               return False;
+
+       if(!prs_uint32("count", ps, depth, &q_q->rights.count))
+               return False;
+
+       if(!smb_io_unistr2_array("rights", &q_q->rights, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a LSA_R_ENUM_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_r_add_acct_rights(const char *desc, LSA_R_ADD_ACCT_RIGHTS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_add_acct_rights");
+       depth++;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
+               return False;
+
+       return True;
+}
+
+
+/*******************************************************************
+ Inits an LSA_Q_REMOVE_ACCT_RIGHTS structure.
+********************************************************************/
+void init_q_remove_acct_rights(LSA_Q_REMOVE_ACCT_RIGHTS *q_q, 
+                              POLICY_HND *hnd, 
+                              DOM_SID *sid,
+                              uint32 removeall,
+                              uint32 count, 
+                              const char **rights)
+{
+       DEBUG(5, ("init_q_remove_acct_rights\n"));
+
+       q_q->pol = *hnd;
+       init_dom_sid2(&q_q->sid, sid);
+       q_q->removeall = removeall;
+       init_unistr2_array(&q_q->rights, count, rights);
+       q_q->count = 5;
+}
+
+
+/*******************************************************************
+reads or writes a LSA_Q_REMOVE_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_q_remove_acct_rights(const char *desc, LSA_Q_REMOVE_ACCT_RIGHTS *q_q, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_q_remove_acct_rights");
+       depth++;
+
+       if (!smb_io_pol_hnd("", &q_q->pol, ps, depth))
+               return False;
+
+       if(!smb_io_dom_sid2("sid", &q_q->sid, ps, depth))
+               return False;
+
+       if(!prs_uint32("removeall", ps, depth, &q_q->removeall))
+               return False;
+
+       if(!prs_uint32("count", ps, depth, &q_q->rights.count))
+               return False;
+
+       if(!smb_io_unistr2_array("rights", &q_q->rights, ps, depth))
+               return False;
+
+       return True;
+}
+
+/*******************************************************************
+reads or writes a LSA_R_ENUM_ACCT_RIGHTS structure.
+********************************************************************/
+BOOL lsa_io_r_remove_acct_rights(const char *desc, LSA_R_REMOVE_ACCT_RIGHTS *r_c, prs_struct *ps, int depth)
+{
+       prs_debug(ps, depth, desc, "lsa_io_r_remove_acct_rights");
+       depth++;
+
+       if(!prs_ntstatus("status", ps, depth, &r_c->status))
                return False;
 
        return True;