Adding LSA_OPENSECRET (-> LsarOpenSecret) and LSA_QUERYSECRET
[samba.git] / source3 / rpc_parse / parse_lsa.c
index 0a49fb7b4da88f621b71a026b667853a409209b5..c01664c15c5d48c294cbdc70a15bc1bd5666324b 100644 (file)
 
 extern int DEBUGLEVEL;
 
-
 /*******************************************************************
 creates a LSA_TRANS_NAME structure.
 ********************************************************************/
-void make_lsa_trans_name(LSA_TRANS_NAME *trn, uint32 sid_name_use, char *name, uint32 idx)
+void make_lsa_trans_name(LSA_TRANS_NAME *trn, UNISTR2 *uni_name,
+                       uint32 sid_name_use, char *name, uint32 idx)
 {
        int len_name = strlen(name);
 
        trn->sid_name_use = sid_name_use;
-       make_uni_hdr(&(trn->hdr_name), len_name, len_name, len_name != 0);
-       make_unistr2(&(trn->uni_name), name, len_name);
+       make_uni_hdr(&(trn->hdr_name), len_name, len_name, 1);
+       make_unistr2(uni_name, name, len_name);
        trn->domain_idx = idx;
 }
 
 /*******************************************************************
 reads or writes a LSA_TRANS_NAME structure.
 ********************************************************************/
-void lsa_io_trans_name(char *desc, LSA_TRANS_NAME *trn, prs_struct *ps, int depth)
+static void lsa_io_trans_name(char *desc, LSA_TRANS_NAME *trn, prs_struct *ps, int depth)
 {
        if (trn == NULL) return;
 
@@ -53,19 +53,16 @@ void lsa_io_trans_name(char *desc, LSA_TRANS_NAME *trn, prs_struct *ps, int dept
        prs_align(ps);
        
        prs_uint32("sid_name_use", ps, depth, &(trn->sid_name_use));
-
        smb_io_unihdr ("hdr_name", &(trn->hdr_name), ps, depth);
-       smb_io_unistr2("uni_name", &(trn->uni_name), trn->hdr_name.buffer, ps, depth);
-
        prs_uint32("domain_idx  ", ps, depth, &(trn->domain_idx  ));
 }
 
 /*******************************************************************
 reads or writes a DOM_R_REF structure.
 ********************************************************************/
-void lsa_io_dom_r_ref(char *desc,  DOM_R_REF *r_r, prs_struct *ps, int depth)
+static void lsa_io_dom_r_ref(char *desc,  DOM_R_REF *r_r, prs_struct *ps, int depth)
 {
-       int i;
+       int i, s, n;
 
        prs_debug(ps, depth, desc, "smb_io_dom_r_ref");
        depth++;
@@ -74,31 +71,105 @@ void lsa_io_dom_r_ref(char *desc,  DOM_R_REF *r_r, prs_struct *ps, int depth)
 
        prs_align(ps);
        
-       prs_uint32("undoc_buffer   ", ps, depth, &(r_r->undoc_buffer)); /* undocumented buffer pointer. */
-       prs_uint32("num_ref_doms_1 ", ps, depth, &(r_r->num_ref_doms_1)); /* num referenced domains? */
-       prs_uint32("buffer_dom_name", ps, depth, &(r_r->buffer_dom_name)); /* undocumented domain name buffer pointer. */
-       prs_uint32("max_entries    ", ps, depth, &(r_r->max_entries)); /* 32 - max number of entries */
-       prs_uint32("num_ref_doms_2 ", ps, depth, &(r_r->num_ref_doms_2)); /* 4 - num referenced domains? */
+       prs_uint32("undoc_buffer  ", ps, depth, &(r_r->undoc_buffer  )); /* undocumented buffer pointer. */
+       prs_uint32("num_ref_doms_1", ps, depth, &(r_r->num_ref_doms_1)); /* num referenced domains? */
+       prs_uint32("ptr_ref_dom   ", ps, depth, &(r_r->ptr_ref_dom   )); /* undocumented buffer pointer. */
+       prs_uint32("max_entries   ", ps, depth, &(r_r->max_entries   )); /* 32 - max number of entries */
 
-       smb_io_unihdr2("", &(r_r->hdr_dom_name), ps, depth); /* domain name unicode string header */
+       SMB_ASSERT_ARRAY(r_r->hdr_ref_dom, r_r->num_ref_doms_1);
 
-       for (i = 0; i < r_r->num_ref_doms_1-1; i++)
+       if (r_r->ptr_ref_dom != 0)
        {
-               smb_io_unihdr2("", &(r_r->hdr_ref_dom[i]), ps, depth);
+               prs_uint32("num_ref_doms_2", ps, depth, &(r_r->num_ref_doms_2)); /* 4 - num referenced domains? */
+               SMB_ASSERT_ARRAY(r_r->ref_dom, r_r->num_ref_doms_2);
+
+               for (i = 0; i < r_r->num_ref_doms_1; i++)
+               {
+                       fstring t;
+
+                       slprintf(t, sizeof(t) - 1, "dom_ref[%d] ", i);
+                       smb_io_unihdr(t, &(r_r->hdr_ref_dom[i].hdr_dom_name), ps, depth);
+
+                       slprintf(t, sizeof(t) - 1, "sid_ptr[%d] ", i);
+                       prs_uint32(t, ps, depth, &(r_r->hdr_ref_dom[i].ptr_dom_sid));
+               }
+
+               for (i = 0, n = 0, s = 0; i < r_r->num_ref_doms_2; i++)
+               {
+                       fstring t;
+
+                       if (r_r->hdr_ref_dom[i].hdr_dom_name.buffer != 0)
+                       {
+                               slprintf(t, sizeof(t) - 1, "dom_ref[%d] ", i);
+                               smb_io_unistr2(t, &(r_r->ref_dom[n].uni_dom_name), True, ps, depth); /* domain name unicode string */
+                               n++;
+                       }
+
+                       if (r_r->hdr_ref_dom[i].ptr_dom_sid != 0)
+                       {
+                               slprintf(t, sizeof(t) - 1, "sid_ptr[%d] ", i);
+                               smb_io_dom_sid2("", &(r_r->ref_dom[s].ref_dom), ps, depth); /* referenced domain SIDs */
+                               s++;
+                       }
+               }
        }
+}
+
+
+/*******************************************************************
+makes an LSA_SEC_QOS structure.
+********************************************************************/
+void make_lsa_sec_qos(LSA_SEC_QOS *qos, uint16 imp_lev, uint8 ctxt, uint8 eff,
+                               uint32 unknown)
+{
+       if (qos == NULL) return;
 
-       smb_io_unistr("", &(r_r->uni_dom_name), ps, depth); /* domain name unicode string */
+       DEBUG(5,("make_lsa_sec_qos\n"));
 
-       for (i = 0; i < r_r->num_ref_doms_2; i++)
+       qos->len = 0x0c; /* length of quality of service block, in bytes */
+       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 void lsa_io_sec_qos(char *desc,  LSA_SEC_QOS *qos, prs_struct *ps, int depth)
+{
+       int start;
+
+       if (qos == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_obj_qos");
+       depth++;
+
+       prs_align(ps);
+       
+       start = ps->offset;
+
+       /* these pointers had _better_ be zero, because we don't know
+          what they point to!
+        */
+       prs_uint32("len           ", ps, depth, &(qos->len           )); /* 0x18 - length (in bytes) inc. the length field. */
+       prs_uint16("sec_imp_level ", ps, depth, &(qos->sec_imp_level )); 
+       prs_uint8 ("sec_ctxt_mode ", ps, depth, &(qos->sec_ctxt_mode )); 
+       prs_uint8 ("effective_only", ps, depth, &(qos->effective_only)); 
+       prs_uint32("unknown       ", ps, depth, &(qos->unknown       )); 
+
+       if (qos->len != ps->offset - start)
        {
-               smb_io_dom_sid2("", &(r_r->ref_dom[i]), ps, depth); /* referenced domain SIDs */
+               DEBUG(3,("lsa_io_sec_qos: length %x does not match size %x\n",
+                        qos->len, ps->offset - start));
        }
 }
 
+
 /*******************************************************************
 makes an LSA_OBJ_ATTR structure.
 ********************************************************************/
-void make_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, uint32 sec_qos)
+void make_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, LSA_SEC_QOS *qos)
 {
        if (attr == NULL) return;
 
@@ -109,13 +180,23 @@ void make_lsa_obj_attr(LSA_OBJ_ATTR *attr, uint32 attributes, uint32 sec_qos)
        attr->ptr_obj_name = 0;
        attr->attributes = attributes;
        attr->ptr_sec_desc = 0;
-       attr->sec_qos = sec_qos;
+       
+       if (qos != NULL)
+       {
+               attr->ptr_sec_qos = 1;
+               attr->sec_qos = qos;
+       }
+       else
+       {
+               attr->ptr_sec_qos = 0;
+               attr->sec_qos = NULL;
+       }
 }
 
 /*******************************************************************
 reads or writes an LSA_OBJ_ATTR structure.
 ********************************************************************/
-void lsa_io_obj_attr(char *desc,  LSA_OBJ_ATTR *attr, prs_struct *ps, int depth)
+static void lsa_io_obj_attr(char *desc,  LSA_OBJ_ATTR *attr, prs_struct *ps, int depth)
 {
        int start;
 
@@ -131,36 +212,47 @@ void lsa_io_obj_attr(char *desc,  LSA_OBJ_ATTR *attr, prs_struct *ps, int depth)
        /* these pointers had _better_ be zero, because we don't know
           what they point to!
         */
-       prs_uint32("len"         , ps, depth, &(attr->len         )); /* 0x18 - length (in bytes) inc. the length field. */
+       prs_uint32("len         ", ps, depth, &(attr->len         )); /* 0x18 - length (in bytes) inc. the length field. */
        prs_uint32("ptr_root_dir", ps, depth, &(attr->ptr_root_dir)); /* 0 - root directory (pointer) */
        prs_uint32("ptr_obj_name", ps, depth, &(attr->ptr_obj_name)); /* 0 - object name (pointer) */
-       prs_uint32("attributes"  , ps, depth, &(attr->attributes  )); /* 0 - attributes (undocumented) */
+       prs_uint32("attributes  ", ps, depth, &(attr->attributes  )); /* 0 - attributes (undocumented) */
        prs_uint32("ptr_sec_desc", ps, depth, &(attr->ptr_sec_desc)); /* 0 - security descriptior (pointer) */
-       prs_uint32("sec_qos"     , ps, depth, &(attr->sec_qos     )); /* 0 - security quality of service */
+       prs_uint32("ptr_sec_qos ", ps, depth, &(attr->ptr_sec_qos )); /* security quality of service (pointer) */
 
        if (attr->len != ps->offset - start)
        {
-               DEBUG(3,("lsa_io_obj_attr: length %lx does not match size %lx\n",
+               DEBUG(3,("lsa_io_obj_attr: length %x does not match size %x\n",
                         attr->len, ps->offset - start));
        }
+
+       if (attr->ptr_sec_qos != 0 && attr->sec_qos != NULL)
+       {
+               lsa_io_sec_qos("sec_qos", attr->sec_qos, ps, depth);
+       }
 }
+
+
 /*******************************************************************
 makes an LSA_Q_OPEN_POL structure.
 ********************************************************************/
-void make_q_open_pol(LSA_Q_OPEN_POL *r_q, char *server_name,
-                       uint32 attributes, uint32 sec_qos,
-                       uint32 desired_access)
+void make_q_open_pol(LSA_Q_OPEN_POL *r_q, uint16 system_name,
+                       uint32 attributes,
+                       uint32 desired_access,
+                       LSA_SEC_QOS *qos)
 {
        if (r_q == NULL) return;
 
-       DEBUG(5,("make_open_pol\n"));
+       DEBUG(5,("make_open_pol: attr:%d da:%d\n", attributes, desired_access));
 
        r_q->ptr = 1; /* undocumented pointer */
 
-       make_unistr2     (&(r_q->uni_server_name), server_name, strlen(server_name));
-       make_lsa_obj_attr(&(r_q->attr           ), attributes, sec_qos);
+       if (qos == NULL)
+       {
+               r_q->des_access = desired_access;
+       }
 
-       r_q->des_access = desired_access;
+       r_q->system_name = system_name;
+       make_lsa_obj_attr(&(r_q->attr           ), attributes, qos);
 }
 
 /*******************************************************************
@@ -174,11 +266,15 @@ void lsa_io_q_open_pol(char *desc,  LSA_Q_OPEN_POL *r_q, prs_struct *ps, int dep
        depth++;
 
        prs_uint32("ptr       ", ps, depth, &(r_q->ptr       ));
+       prs_uint16("system_name", ps, depth, &(r_q->system_name ));
+       prs_align ( ps );
 
-       smb_io_unistr2 ("", &(r_q->uni_server_name), r_q->ptr, ps, depth);
        lsa_io_obj_attr("", &(r_q->attr           ), ps, depth);
 
-       prs_uint32("des_access", ps, depth, &(r_q->des_access));
+       if (r_q->attr.ptr_sec_qos == 0)
+       {
+               prs_uint32("des_access", ps, depth, &(r_q->des_access));
+       }
 }
 
 /*******************************************************************
@@ -191,6 +287,64 @@ void lsa_io_r_open_pol(char *desc,  LSA_R_OPEN_POL *r_p, prs_struct *ps, int dep
        prs_debug(ps, depth, desc, "lsa_io_r_open_pol");
        depth++;
 
+       smb_io_pol_hnd("", &(r_p->pol), ps, depth);
+
+       prs_uint32("status", ps, depth, &(r_p->status));
+}
+
+/*******************************************************************
+makes an LSA_Q_OPEN_POL2 structure.
+********************************************************************/
+void make_q_open_pol2(LSA_Q_OPEN_POL2 *r_q, char *server_name,
+                       uint32 attributes,
+                       uint32 desired_access,
+                       LSA_SEC_QOS *qos)
+{
+       if (r_q == NULL) return;
+
+       DEBUG(5,("make_open_pol2: attr:%d da:%d\n", attributes, desired_access));
+
+       r_q->ptr = 1; /* undocumented pointer */
+
+       if (qos == NULL)
+       {
+               r_q->des_access = desired_access;
+       }
+
+       make_unistr2     (&(r_q->uni_server_name), server_name, strlen(server_name));
+       make_lsa_obj_attr(&(r_q->attr           ), attributes, qos);
+}
+
+/*******************************************************************
+reads or writes an LSA_Q_OPEN_POL2 structure.
+********************************************************************/
+void lsa_io_q_open_pol2(char *desc,  LSA_Q_OPEN_POL2 *r_q, prs_struct *ps, int depth)
+{
+       if (r_q == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_open_pol2");
+       depth++;
+
+       prs_uint32("ptr       ", ps, depth, &(r_q->ptr       ));
+
+       smb_io_unistr2 ("", &(r_q->uni_server_name), r_q->ptr, ps, depth);
+       lsa_io_obj_attr("", &(r_q->attr           ), ps, depth);
+
+       if (r_q->attr.ptr_sec_qos == 0)
+       {
+               prs_uint32("des_access", ps, depth, &(r_q->des_access));
+       }
+}
+
+/*******************************************************************
+reads or writes an LSA_R_OPEN_POL2 structure.
+********************************************************************/
+void lsa_io_r_open_pol2(char *desc,  LSA_R_OPEN_POL2 *r_p, prs_struct *ps, int depth)
+{
+       if (r_p == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_open_pol2");
+       depth++;
 
        smb_io_pol_hnd("", &(r_p->pol), ps, depth);
 
@@ -226,6 +380,171 @@ void lsa_io_q_query(char *desc,  LSA_Q_QUERY_INFO *q_q, prs_struct *ps, int dept
        prs_uint16("info_class", ps, depth, &(q_q->info_class));
 }
 
+/*******************************************************************
+makes an LSA_Q_OPEN_SECRET structure.
+********************************************************************/
+void make_q_open_secret(LSA_Q_OPEN_SECRET *q_o, POLICY_HND *pol_hnd,
+                       char *secret_name, uint32 desired_access)
+{
+       int len = strlen(secret_name);
+
+       if (q_o == NULL) return;
+
+       DEBUG(5,("make_q_open_secret"));
+
+       memcpy(&(q_o->pol), pol_hnd, sizeof(q_o->pol));
+
+       make_uni_hdr(&(q_o->hdr_secret), len, len, 1);
+       make_unistr2(&(q_o->uni_secret), secret_name, len);
+
+       q_o->des_access = desired_access;
+}
+
+/*******************************************************************
+reads or writes an LSA_Q_OPEN_SECRET structure.
+********************************************************************/
+void lsa_io_q_open_secret(char *desc, LSA_Q_OPEN_SECRET *q_o, prs_struct *ps, int depth)
+{
+       if (q_o == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_open_secret");
+       depth++;
+
+       smb_io_pol_hnd("", &(q_o->pol), ps, depth);
+
+       prs_align(ps);
+       smb_io_unihdr ("", &(q_o->hdr_secret), ps, depth);
+       smb_io_unistr2("", &(q_o->uni_secret), 1, ps, depth);
+
+       prs_align(ps);
+       prs_uint32("des_access", ps, depth, &(q_o->des_access));
+}
+
+/*******************************************************************
+reads or writes an LSA_R_OPEN_SECRET structure.
+********************************************************************/
+void lsa_io_r_open_secret(char *desc, LSA_R_OPEN_SECRET *r_o, prs_struct *ps, int depth)
+{
+       if (r_o == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_open_secret");
+       depth++;
+
+       smb_io_pol_hnd("", &(r_o->pol), ps, depth);
+
+       prs_uint32("status", ps, depth, &(r_o->status));
+}
+
+/*******************************************************************
+reads or writes an LSA_SECRET_VALUE structure.
+********************************************************************/
+void lsa_io_secret_value(char *desc, LSA_SECRET_VALUE *value, prs_struct *ps, int depth)
+{
+       if (value == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_secret_value");
+       depth++;
+
+       prs_align(ps);
+       prs_uint32("ptr_secret", ps, depth, &(value->ptr_secret));
+
+       if (value->ptr_secret == 0)
+       {
+               return;
+       }
+
+       smb_io_strhdr2("hdr_secret", &(value->hdr_secret), ps, depth);
+       smb_io_string2("secret"    , &(value->secret    ),
+                      value->hdr_secret.buffer, ps, depth);
+}
+
+/*******************************************************************
+reads or writes an LSA_SECRET_INFO structure.
+********************************************************************/
+void lsa_io_secret_info(char *desc, LSA_SECRET_INFO *info, prs_struct *ps, int depth)
+{
+       if (info == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_secret_info");
+       depth++;
+
+       prs_align(ps);
+       prs_uint32("ptr_value ", ps, depth, &(info->ptr_value ));
+
+       if (info->ptr_value != 0)
+       {
+               lsa_io_secret_value("", &(info->value), ps, depth);
+       }
+
+       prs_align(ps);
+       prs_uint32("ptr_update", ps, depth, &(info->ptr_update));
+
+       if (info->ptr_update != 0)
+       {
+               ps->align = 8;
+               prs_align(ps);
+               ps->align = 4;
+
+               smb_io_time("last_update", &(info->last_update), ps, depth);
+       }
+}
+
+/*******************************************************************
+makes an LSA_Q_QUERY_SECRET structure.
+********************************************************************/
+void make_q_query_secret(LSA_Q_QUERY_SECRET *q_q, POLICY_HND *pol)
+{
+       if (q_q == NULL) return;
+
+       DEBUG(5,("make_q_query_secret"));
+
+       memcpy(&(q_q->pol), pol, sizeof(q_q->pol));
+
+       /* Want secret */
+       q_q->info.ptr_value = 1;
+       q_q->info.value.ptr_secret = 0;
+
+       /* Want last change time */
+       q_q->info.ptr_update = 1;
+
+       /* Don't care about old info */
+       q_q->oldinfo.ptr_value = 0;
+       q_q->oldinfo.ptr_update = 0;
+}
+
+/*******************************************************************
+reads or writes an LSA_Q_QUERY_SECRET structure.
+********************************************************************/
+void lsa_io_q_query_secret(char *desc, LSA_Q_QUERY_SECRET *q_q, prs_struct *ps, int depth)
+{
+       if (q_q == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_query_secret");
+       depth++;
+
+       smb_io_pol_hnd("", &(q_q->pol), ps, depth);
+
+       lsa_io_secret_info("", &(q_q->info   ), ps, depth);
+       lsa_io_secret_info("", &(q_q->oldinfo), ps, depth);
+}
+
+/*******************************************************************
+reads or writes an LSA_Q_QUERY_SECRET structure.
+********************************************************************/
+void lsa_io_r_query_secret(char *desc, LSA_R_QUERY_SECRET *r_q, prs_struct *ps, int depth)
+{
+       if (r_q == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_query_secret");
+       depth++;
+
+       lsa_io_secret_info("", &(r_q->info   ), ps, depth);
+       lsa_io_secret_info("", &(r_q->oldinfo), ps, depth);
+
+       prs_align(ps);
+       prs_uint32("status", ps, depth, &(r_q->status));
+}
+
 /*******************************************************************
 reads or writes an LSA_Q_ENUM_TRUST_DOM structure.
 ********************************************************************/
@@ -247,8 +566,8 @@ void lsa_io_q_enum_trust_dom(char *desc,  LSA_Q_ENUM_TRUST_DOM *q_e, prs_struct
 makes an LSA_R_ENUM_TRUST_DOM structure.
 ********************************************************************/
 void make_r_enum_trust_dom(LSA_R_ENUM_TRUST_DOM *r_e,
-                               uint32 enum_context, char *domain_name, char *domain_sid,
-                               uint32 status)
+                           uint32 enum_context, char *domain_name, DOM_SID *domain_sid,
+                           uint32 status)
 {
        if (r_e == NULL) return;
 
@@ -302,60 +621,6 @@ void lsa_io_r_enum_trust_dom(char *desc,  LSA_R_ENUM_TRUST_DOM *r_e, prs_struct
        prs_uint32("status", ps, depth, &(r_e->status));
 }
 
-/*******************************************************************
-makes an LSA_Q_CLOSE structure.
-********************************************************************/
-void make_lsa_q_close(LSA_Q_CLOSE *q_c, POLICY_HND *hnd)
-{
-       if (q_c == NULL || hnd == NULL) return;
-
-       DEBUG(5,("make_lsa_q_close\n"));
-
-       memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
-}
-
-
-/*******************************************************************
-reads or writes an LSA_Q_CLOSE structure.
-********************************************************************/
-void lsa_io_q_close(char *desc,  LSA_Q_CLOSE *q_c, prs_struct *ps, int depth)
-{
-       if (q_c == NULL) return;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_close");
-       depth++;
-
-       smb_io_pol_hnd("", &(q_c->pol), ps, depth);
-}
-
-/*******************************************************************
-makes an LSA_R_CLOSE structure.
-********************************************************************/
-void make_lsa_r_close(LSA_R_CLOSE *q_r, POLICY_HND *hnd)
-{
-       if (q_r == NULL || hnd == NULL) return;
-
-       DEBUG(5,("make_lsa_r_close\n"));
-
-       memcpy(&(q_r->pol), hnd, sizeof(q_r->pol));
-}
-
-
-/*******************************************************************
-reads or writes an LSA_R_CLOSE structure.
-********************************************************************/
-void lsa_io_r_close(char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
-{
-       if (r_c == NULL) return;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_close");
-       depth++;
-
-       smb_io_pol_hnd("", &(r_c->pol), ps, depth);
-
-       prs_uint32("status", ps, depth, &(r_c->status));
-}
-
 /*******************************************************************
 reads or writes an LSA_Q_QUERY_INFO structure.
 ********************************************************************/
@@ -395,10 +660,42 @@ void lsa_io_r_query(char *desc,  LSA_R_QUERY_INFO *r_q, prs_struct *ps, int dept
        prs_uint32("status", ps, depth, &(r_q->status));
 }
 
+/*******************************************************************
+makes a LSA_SID_ENUM structure.
+********************************************************************/
+void make_lsa_sid_enum(LSA_SID_ENUM *sen, int num_entries, DOM_SID **sids)
+{
+       int i, i2;
+       if (sen == NULL || sids == NULL) return;
+
+       DEBUG(5,("make_lsa_sid_enum\n"));
+
+       sen->num_entries  = num_entries;
+       sen->ptr_sid_enum = num_entries != 0 ? 1 : 0;
+       sen->num_entries2 = num_entries;
+
+       SMB_ASSERT_ARRAY(sen->sid, sen->num_entries);
+
+       for (i = 0, i2 = 0; i < num_entries; i++)
+       {
+               if (sids[i] != NULL)
+               {
+                       sen->ptr_sid[i] = 1;
+                       make_dom_sid2(&(sen->sid[i2]), sids[i]);
+                       i2++;
+               }
+               else
+               {
+                       sen->ptr_sid[i] = 0;
+               }
+       }
+}
+
 /*******************************************************************
 reads or writes a LSA_SID_ENUM structure.
 ********************************************************************/
-void lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps, int depth)
+static void lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen,
+                               prs_struct *ps, int depth)
 {
        int i;
 
@@ -413,77 +710,105 @@ void lsa_io_sid_enum(char *desc, LSA_SID_ENUM *sen, prs_struct *ps, int depth)
        prs_uint32("ptr_sid_enum", ps, depth, &(sen->ptr_sid_enum)); 
        prs_uint32("num_entries2", ps, depth, &(sen->num_entries2)); 
 
+       SMB_ASSERT_ARRAY(sen->ptr_sid, sen->num_entries);
+
        for (i = 0; i < sen->num_entries; i++)
        {       
                fstring temp;
-               sprintf(temp, "ptr_sid[%d]", i);
+               slprintf(temp, sizeof(temp) - 1, "ptr_sid[%d]", i);
                prs_uint32(temp, ps, depth, &(sen->ptr_sid[i])); /* domain SID pointers to be looked up. */
        }
 
+       SMB_ASSERT_ARRAY(sen->sid, sen->num_entries);
+
        for (i = 0; i < sen->num_entries; i++)
        {
                fstring temp;
-               sprintf(temp, "sid[%d]", i);
+               slprintf(temp, sizeof(temp) - 1, "sid[%d]", i);
                smb_io_dom_sid2(temp, &(sen->sid[i]), ps, depth); /* domain SIDs to be looked up. */
        }
 }
 
 /*******************************************************************
-reads or writes a LSA_Q_LOOKUP_SIDS structure.
+reads or writes a structure.
 ********************************************************************/
-void lsa_io_q_lookup_sids(char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *ps, int depth)
+static void lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn,
+                               prs_struct *ps, int depth)
 {
-       if (q_s == NULL) return;
+       int i;
 
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_sids");
+       if (trn == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_trans_names");
        depth++;
 
        prs_align(ps);
        
-    smb_io_pol_hnd     ("pol_hnd", &(q_s->pol_hnd), ps, depth); /* policy handle */
-    lsa_io_sid_enum    ("sids   ", &(q_s->sids   ), ps, depth); /* sids to be looked up */
-    lsa_io_trans_names ("names  ", &(q_s->names  ), ps, depth); /* translated names */
-    smb_io_lookup_level("switch ", &(q_s->level  ), ps, depth); /* lookup level */
+       prs_uint32("num_entries    ", ps, depth, &(trn->num_entries));
+       prs_uint32("ptr_trans_names", ps, depth, &(trn->ptr_trans_names));
 
-       prs_uint32("mapped_count", ps, depth, &(q_s->mapped_count));
+       if (trn->ptr_trans_names != 0)
+       {
+               prs_uint32("num_entries2   ", ps, depth, &(trn->num_entries2));
+               SMB_ASSERT_ARRAY(trn->name, trn->num_entries);
+
+               for (i = 0; i < trn->num_entries2; i++)
+               {
+                       fstring t;
+                       slprintf(t, sizeof(t) - 1, "name[%d] ", i);
+
+                       lsa_io_trans_name(t, &(trn->name[i]), ps, depth); /* translated name */
+
+               }
+               for (i = 0; i < trn->num_entries2; i++)
+               {
+                       fstring t;
+                       slprintf(t, sizeof(t) - 1, "name[%d] ", i);
+
+                       smb_io_unistr2(t, &(trn->uni_name[i]), trn->name[i].hdr_name.buffer, ps, depth);
+                       prs_align(ps);
+               }
+       }
 }
 
 /*******************************************************************
-reads or writes a structure.
+makes a structure.
 ********************************************************************/
-void lsa_io_trans_names(char *desc, LSA_TRANS_NAME_ENUM *trn, prs_struct *ps, int depth)
+void make_q_lookup_sids(LSA_Q_LOOKUP_SIDS *q_l, POLICY_HND *hnd,
+                               int num_sids, DOM_SID **sids,
+                               uint16 level)
 {
-       int i;
-       int i2;
+       if (q_l == NULL) return;
 
-       if (trn == NULL) return;
+       DEBUG(5,("make_q_lookup_sids\n"));
 
-       prs_debug(ps, depth, desc, "lsa_io_trans_names");
+       memcpy(&(q_l->pol), hnd, sizeof(q_l->pol));
+       make_lsa_sid_enum(&(q_l->sids), num_sids, sids);
+
+       q_l->names.ptr_trans_names = 0;
+       q_l->names.num_entries     = 0;
+
+       q_l->level.value = level;
+}
+
+/*******************************************************************
+reads or writes a LSA_Q_LOOKUP_SIDS structure.
+********************************************************************/
+void lsa_io_q_lookup_sids(char *desc, LSA_Q_LOOKUP_SIDS *q_s, prs_struct *ps, int depth)
+{
+       if (q_s == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_lookup_sids");
        depth++;
 
        prs_align(ps);
        
-       prs_uint32("num_entries    ", ps, depth, &(trn->num_entries));
-       prs_uint32("ptr_trans_names", ps, depth, &(trn->ptr_trans_names));
-       prs_uint32("num_entries2   ", ps, depth, &(trn->num_entries2));
+       smb_io_pol_hnd     ("pol_hnd", &(q_s->pol), ps, depth); /* policy handle */
+       lsa_io_sid_enum    ("sids   ", &(q_s->sids   ), ps, depth); /* sids to be looked up */
+       lsa_io_trans_names ("names  ", &(q_s->names  ), ps, depth); /* translated names */
+       smb_io_lookup_level("switch ", &(q_s->level  ), ps, depth); /* lookup level */
 
-       for (i = 0; i < trn->num_entries; i++)
-       {       
-               fstring temp;
-               sprintf(temp, "ptr_name[%d] ", i);
-               prs_uint32(temp, ps, depth, &(trn->ptr_name[i])); /* pointer to translated name */
-       }
-
-       for (i = 0, i2 = 0; i < trn->num_entries2; i++)
-       {
-               if (trn->ptr_name[i] != 0)
-               {
-                       fstring temp;
-                       sprintf(temp, "name[%d] ", i);
-                       lsa_io_trans_name(temp, &(trn->name[i2]), ps, depth); /* translated name */
-                       i2++;
-               }
-       }
+       prs_uint32("mapped_count", ps, depth, &(q_s->mapped_count));
 }
 
 /*******************************************************************
@@ -501,55 +826,98 @@ void lsa_io_r_lookup_sids(char *desc,  LSA_R_LOOKUP_SIDS *r_s, prs_struct *ps, i
        lsa_io_dom_r_ref  ("dom_ref", r_s->dom_ref, ps, depth); /* domain reference info */
        lsa_io_trans_names("names  ", r_s->names  , ps, depth); /* translated names */
 
+       prs_align(ps);
+
        prs_uint32("mapped_count", ps, depth, &(r_s->mapped_count));
 
        prs_uint32("status      ", ps, depth, &(r_s->status));
 }
 
+/*******************************************************************
+makes a structure.
+********************************************************************/
+void make_q_lookup_names(LSA_Q_LOOKUP_NAMES *q_l, POLICY_HND *hnd,
+                               int num_names, const char **names)
+{
+       int i;
+       if (q_l == NULL) return;
+
+       DEBUG(5,("make_q_lookup_names\n"));
+
+       memcpy(&(q_l->pol), hnd, sizeof(q_l->pol));
+
+       q_l->num_entries     = num_names;
+       q_l->num_entries2    = num_names;
+
+       SMB_ASSERT_ARRAY(q_l->uni_name, q_l->num_entries);
+
+       for (i = 0; i < num_names; i++)
+       {
+               const char* name = names[i];
+               int len = strlen(name);
+               make_uni_hdr(&q_l->hdr_name[i], len, len, len != 0);
+               make_unistr2(&q_l->uni_name[i], name, len);
+       }
+
+       q_l->num_trans_entries  = 0;
+       q_l->ptr_trans_sids  = 0;
+       q_l->lookup_level = 1;
+       q_l->mapped_count = 0;
+}
+
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void lsa_io_q_lookup_rids(char *desc,  LSA_Q_LOOKUP_RIDS *q_r, prs_struct *ps, int depth)
+void lsa_io_q_lookup_names(char *desc,  LSA_Q_LOOKUP_NAMES *q_r, prs_struct *ps, int depth)
 {
        int i;
 
        if (q_r == NULL) return;
 
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_rids");
+       prs_debug(ps, depth, desc, "lsa_io_q_lookup_names");
        depth++;
 
        prs_align(ps);
        
-    smb_io_pol_hnd("", &(q_r->pol_hnd), ps, depth); /* policy handle */
+       smb_io_pol_hnd("", &(q_r->pol), ps, depth); /* policy handle */
 
        prs_uint32("num_entries    ", ps, depth, &(q_r->num_entries));
        prs_uint32("num_entries2   ", ps, depth, &(q_r->num_entries2));
-       prs_uint32("buffer_dom_sid ", ps, depth, &(q_r->buffer_dom_sid)); /* undocumented domain SID buffer pointer */
-       prs_uint32("buffer_dom_name", ps, depth, &(q_r->buffer_dom_name)); /* undocumented domain name buffer pointer */
+
+       SMB_ASSERT_ARRAY(q_r->uni_name, q_r->num_entries);
+
+       for (i = 0; i < q_r->num_entries; i++)
+       {
+               smb_io_unihdr("hdr_name", &(q_r->hdr_name[i]), ps, depth); /* pointer names */
+       }
 
        for (i = 0; i < q_r->num_entries; i++)
        {
-               smb_io_dom_name("", &(q_r->lookup_name[i]), ps, depth); /* names to be looked up */
+               smb_io_unistr2("dom_name", &(q_r->uni_name[i]), q_r->hdr_name[i].buffer, ps, depth); /* names to be looked up */
+               prs_align(ps);
        }
 
-       prs_uint8s (False, "undoc          ", ps, depth, q_r->undoc, UNKNOWN_LEN);
+       prs_uint32("num_trans_entries ", ps, depth, &(q_r->num_trans_entries));
+       prs_uint32("ptr_trans_sids ", ps, depth, &(q_r->ptr_trans_sids));
+       prs_uint32("lookup_level   ", ps, depth, &(q_r->lookup_level  ));
+       prs_uint32("mapped_count   ", ps, depth, &(q_r->mapped_count  ));
 }
 
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-void lsa_io_r_lookup_rids(char *desc,  LSA_R_LOOKUP_RIDS *r_r, prs_struct *ps, int depth)
+void lsa_io_r_lookup_names(char *desc,  LSA_R_LOOKUP_NAMES *r_r, prs_struct *ps, int depth)
 {
        int i;
 
        if (r_r == NULL) return;
 
-       prs_debug(ps, depth, desc, "lsa_io_r_lookup_rids");
+       prs_debug(ps, depth, desc, "lsa_io_r_lookup_names");
        depth++;
 
        prs_align(ps);
        
-       lsa_io_dom_r_ref("", &(r_r->dom_ref), ps, depth); /* domain reference info */
+       lsa_io_dom_r_ref("", r_r->dom_ref, ps, depth); /* domain reference info */
 
        prs_uint32("num_entries ", ps, depth, &(r_r->num_entries));
        prs_uint32("undoc_buffer", ps, depth, &(r_r->undoc_buffer));
@@ -560,8 +928,49 @@ void lsa_io_r_lookup_rids(char *desc,  LSA_R_LOOKUP_RIDS *r_r, prs_struct *ps, i
                smb_io_dom_rid2("", &(r_r->dom_rid[i]), ps, depth); /* domain RIDs being looked up */
        }
 
-       prs_uint32("num_entries3", ps, depth, &(r_r->num_entries3));
+       prs_uint32("mapped_count", ps, depth, &(r_r->mapped_count));
 
        prs_uint32("status      ", ps, depth, &(r_r->status));
 }
 
+
+/*******************************************************************
+makes an LSA_Q_CLOSE structure.
+********************************************************************/
+void make_lsa_q_close(LSA_Q_CLOSE *q_c, POLICY_HND *hnd)
+{
+       if (q_c == NULL || hnd == NULL) return;
+
+       DEBUG(5,("make_lsa_q_close\n"));
+
+       memcpy(&(q_c->pol), hnd, sizeof(q_c->pol));
+}
+
+/*******************************************************************
+reads or writes an LSA_Q_CLOSE structure.
+********************************************************************/
+void lsa_io_q_close(char *desc,  LSA_Q_CLOSE *q_c, prs_struct *ps, int depth)
+{
+       if (q_c == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_q_close");
+       depth++;
+
+       smb_io_pol_hnd("", &(q_c->pol), ps, depth);
+}
+
+/*******************************************************************
+reads or writes an LSA_R_CLOSE structure.
+********************************************************************/
+void lsa_io_r_close(char *desc,  LSA_R_CLOSE *r_c, prs_struct *ps, int depth)
+{
+       if (r_c == NULL) return;
+
+       prs_debug(ps, depth, desc, "lsa_io_r_close");
+       depth++;
+
+       smb_io_pol_hnd("", &(r_c->pol), ps, depth);
+
+       prs_uint32("status", ps, depth, &(r_c->status));
+}
+