fix for potential lsass.exe crashing due to negative response from
[samba.git] / source3 / rpc_server / srv_lsa.c
index 0675743eee855d8a0715b2273b89183f04bd0a96..4db97f6d4c0caa23dfd86f1d79424fb730ea23d6 100644 (file)
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
-extern DOM_SID global_machine_sid;
+extern DOM_SID global_sam_sid;
+extern fstring global_sam_name;
+extern DOM_SID global_member_sid;
+extern fstring global_myworkgroup;
+extern DOM_SID global_sid_S_1_5_20;
+
+/***************************************************************************
+lsa_reply_open_policy2
+ ***************************************************************************/
+static void lsa_reply_open_policy2(prs_struct *rdata)
+{
+       int i;
+       LSA_R_OPEN_POL2 r_o;
+
+       ZERO_STRUCT(r_o);
+
+       /* set up the LSA QUERY INFO response */
+
+       for (i = 4; i < POL_HND_SIZE; i++)
+       {
+               r_o.pol.data[i] = i;
+       }
+       r_o.status = 0x0;
+
+       /* store the response in the SMB stream */
+       lsa_io_r_open_pol2("", &r_o, rdata, 0);
+}
 
 /***************************************************************************
 lsa_reply_open_policy
@@ -57,17 +83,19 @@ make_dom_query
  ***************************************************************************/
 static void make_dom_query(DOM_QUERY *d_q, char *dom_name, DOM_SID *dom_sid)
 {
+       fstring sid_str;
        int domlen = strlen(dom_name);
 
        d_q->uni_dom_max_len = domlen * 2;
        d_q->uni_dom_str_len = domlen * 2;
 
-       d_q->buffer_dom_name = 4; /* domain buffer pointer */
-       d_q->buffer_dom_sid  = 2; /* domain sid pointer */
+       d_q->buffer_dom_name = domlen  != 0    ? 1 : 0; /* domain buffer pointer */
+       d_q->buffer_dom_sid  = dom_sid != NULL ? 1 : 0; /* domain sid pointer */
 
        /* this string is supposed to be character short */
        make_unistr2(&(d_q->uni_domain_name), dom_name, domlen);
 
+       sid_to_string(sid_str, dom_sid);
        make_dom_sid2(&(d_q->dom_sid), dom_sid);
 }
 
@@ -113,114 +141,214 @@ static void lsa_reply_query_info(LSA_Q_QUERY_INFO *q_q, prs_struct *rdata,
        lsa_io_r_query("", &r_q, rdata, 0);
 }
 
-/***************************************************************************
-make_dom_ref
-
- pretty much hard-coded choice of "other" sids, unfortunately...
 
+/***************************************************************************
+make_dom_ref - adds a domain if it's not already in, returns the index
  ***************************************************************************/
-static void make_dom_ref(DOM_R_REF *ref, char *dom_name, DOM_SID *dom_sid,
-                         DOM_SID *other_sid1, DOM_SID *other_sid2, DOM_SID *other_sid3)
+static int make_dom_ref(DOM_R_REF *ref, char *dom_name, DOM_SID *dom_sid)
+                         
 {
-       int len_dom_name   = strlen(dom_name);
+       int num = 0;
+       int len;
 
-       ref->undoc_buffer = 1;
-       ref->num_ref_doms_1 = 4;
-       ref->buffer_dom_name = 1;
-       ref->max_entries = 32;
-       ref->num_ref_doms_2 = 4;
+       if (dom_name != NULL)
+       {
+               for (num = 0; num < ref->num_ref_doms_1; num++)
+               {
+                       fstring domname;
+                       fstrcpy(domname, unistr2_to_str(&ref->ref_dom[num].uni_dom_name));
+                       if (strequal(domname, dom_name))
+                       {       
+                               return num;
+                       }
+               }
 
-       make_uni_hdr2(&(ref->hdr_dom_name  ), len_dom_name  , len_dom_name  , 0);
-       make_uni_hdr2(&(ref->hdr_ref_dom[0]), sizeof(DOM_SID), sizeof(DOM_SID), 0);
-       make_uni_hdr2(&(ref->hdr_ref_dom[1]), sizeof(DOM_SID), sizeof(DOM_SID), 0);
-       make_uni_hdr2(&(ref->hdr_ref_dom[2]), sizeof(DOM_SID), sizeof(DOM_SID), 0);
+       }
+       else
+       {
+               num = ref->num_ref_doms_1;
+       }
 
-       if (dom_name != NULL)
+       if (num >= MAX_REF_DOMAINS)
        {
-               make_unistr(&(ref->uni_dom_name), dom_name);
+               /* index not found, already at maximum domain limit */
+               return -1;
        }
 
-       make_dom_sid2(&(ref->ref_dom[0]), dom_sid   );
-       make_dom_sid2(&(ref->ref_dom[1]), other_sid1);
-       make_dom_sid2(&(ref->ref_dom[2]), other_sid2);
-       make_dom_sid2(&(ref->ref_dom[3]), other_sid3);
+       ref->undoc_buffer = 1;
+       ref->num_ref_doms_1 = num+1;
+       ref->ptr_ref_dom  = 1;
+       ref->max_entries = MAX_REF_DOMAINS;
+       ref->num_ref_doms_2 = num+1;
+
+       len = dom_name != NULL ? strlen(dom_name) : 0;
+
+       make_uni_hdr(&(ref->hdr_ref_dom[num].hdr_dom_name), len, len, len != 0 ? 1 : 0);
+       ref->hdr_ref_dom[num].ptr_dom_sid = dom_sid != NULL ? 1 : 0;
+
+       make_unistr2 (&(ref->ref_dom[num].uni_dom_name), dom_name, len);
+       make_dom_sid2(&(ref->ref_dom[num].ref_dom     ), dom_sid );
+
+       return num;
 }
 
 /***************************************************************************
-make_reply_lookup_rids
+make_lsa_rid2s
  ***************************************************************************/
-static void make_reply_lookup_rids(LSA_R_LOOKUP_RIDS *r_l,
-                               int num_entries, uint32 dom_rids[MAX_LOOKUP_SIDS],
-                               char *dom_name, DOM_SID *dom_sid,
-                               DOM_SID *other_sid1, DOM_SID *other_sid2, DOM_SID *other_sid3)
+static void make_lsa_rid2s(DOM_R_REF *ref,
+                               DOM_RID2 *rid2,
+                               int num_entries, UNISTR2 name[MAX_LOOKUP_SIDS],
+                               uint32 *mapped_count)
 {
        int i;
+       int total = 0;
+       (*mapped_count) = 0;
 
-       make_dom_ref(&(r_l->dom_ref), dom_name, dom_sid,
-                    other_sid1, other_sid2, other_sid3);
-
-       r_l->num_entries = num_entries;
-       r_l->undoc_buffer = 1;
-       r_l->num_entries2 = num_entries;
-
-       SMB_ASSERT_ARRAY(r_l->dom_rid, num_entries);
+       SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
 
        for (i = 0; i < num_entries; i++)
        {
-               make_dom_rid2(&(r_l->dom_rid[i]), dom_rids[i]);
+               uint32 status = 0x0;
+               DOM_SID find_sid;
+               DOM_SID sid;
+               uint32 rid = 0xffffffff;
+               int dom_idx = -1;
+               fstring find_name;
+               char *dom_name = NULL;
+               uint8 sid_name_use = SID_NAME_UNKNOWN;
+
+               fstrcpy(find_name, unistr2_to_str(&name[i]));
+               dom_name = strdup(find_name);
+
+               if (map_domain_name_to_sid(&sid, &dom_name))
+               {
+                       sid_name_use = SID_NAME_DOMAIN;
+                       dom_idx = make_dom_ref(ref, dom_name, &find_sid);
+               }
+
+               if (lookup_name(find_name, &sid, &sid_name_use) == 0x0 &&
+                   sid_split_rid(&sid, &rid))
+               {
+                       if (map_domain_sid_to_name(&sid, find_name))
+                       {
+                               dom_idx = make_dom_ref(ref, find_name, &sid);
+                       }
+                       else
+                       {
+                               status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+                       }
+               }
+               else
+               {
+                       status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+               }
+
+               if (status == 0x0)
+               {
+                       (*mapped_count)++;
+               }
+               else
+               {
+                       dom_idx = -1;
+                       rid = 0xffffffff;
+                       sid_name_use = SID_NAME_UNKNOWN;
+               }
+
+               make_dom_rid2(&rid2[total], rid, sid_name_use, dom_idx);
+               total++;
+
+               if (dom_name != NULL)
+               {
+                       free(dom_name);
+               }
        }
+}
 
-       r_l->num_entries3 = num_entries;
+/***************************************************************************
+make_reply_lookup_names
+ ***************************************************************************/
+static void make_reply_lookup_names(LSA_R_LOOKUP_NAMES *r_l,
+                               DOM_R_REF *ref, DOM_RID2 *rid2,
+                               uint32 mapped_count, uint32 status)
+{
+       r_l->dom_ref      = ref;
+       r_l->dom_rid      = rid2;
+       r_l->mapped_count = mapped_count;
+       r_l->status       = status;
 }
 
 /***************************************************************************
 make_lsa_trans_names
  ***************************************************************************/
-static void make_lsa_trans_names(LSA_TRANS_NAME_ENUM *trn,
+static void make_lsa_trans_names(DOM_R_REF *ref,
+                               LSA_TRANS_NAME_ENUM *trn,
                                int num_entries, DOM_SID2 sid[MAX_LOOKUP_SIDS],
-                               uint32 *total)
+                               uint32 *mapped_count)
 {
-       uint32 status = 0x0;
        int i;
-       (*total) = 0;
+       int total = 0;
+       (*mapped_count) = 0;
 
        SMB_ASSERT(num_entries <= MAX_LOOKUP_SIDS);
 
        for (i = 0; i < num_entries; i++)
        {
+               uint32 status = 0x0;
+               DOM_SID find_sid = sid[i].sid;
+               DOM_SID tmp_sid  = sid[i].sid;
                uint32 rid = 0xffffffff;
-               uint8 num_auths = sid[i].sid.num_auths;
+               int dom_idx = -1;
                fstring name;
-               uint32 type;
+               fstring dom_name;
+               uint8 sid_name_use = 0;
                
-               trn->ptr_name[i] = 0;
-               trn->ptr_name[(*total)] = 0;
-
-               SMB_ASSERT_ARRAY(sid[i].sid.sub_auths, num_auths);
+               memset(dom_name, 0, sizeof(dom_name));
+               memset(name    , 0, sizeof(name    ));
 
-               /* find the rid to look up */
-               if (num_auths != 0)
+               if (map_domain_sid_to_name(&find_sid, dom_name))
+               {
+                       sid_name_use = SID_NAME_DOMAIN;
+                       dom_idx = make_dom_ref(ref, dom_name, &find_sid);
+               }
+               else if (sid_split_rid         (&find_sid, &rid) &&
+                        map_domain_sid_to_name(&find_sid, dom_name))
+               {
+                       if (sid_equal(&find_sid, &global_sam_sid) ||
+                           sid_equal(&find_sid, &global_sid_S_1_5_20))
+                       {
+                               status = lookup_sid(&tmp_sid, name, &sid_name_use);
+                       }
+                       else
+                       {
+                               status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
+                       }
+               }
+               else
                {
-                       rid = sid[i].sid.sub_auths[num_auths-1];
-
                        status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
-
-                       status = (status != 0x0) ? lookup_user_name (rid, name, &type) : status;
-                       status = (status != 0x0) ? lookup_group_name(rid, name, &type) : status;
-                       status = (status != 0x0) ? lookup_alias_name(rid, name, &type) : status;
                }
 
+               dom_idx = make_dom_ref(ref, dom_name, &find_sid);
+
                if (status == 0x0)
                {
-                       trn->ptr_name[i] = 1;
-                       make_lsa_trans_name(&(trn->name[(*total)]), type, name, (*total));
-                       (*total)++;
+                       (*mapped_count)++;
                }
+               else
+               {
+                       snprintf(name, sizeof(name), "%08x", rid);
+                       sid_name_use = SID_NAME_UNKNOWN;
+
+               }
+               make_lsa_trans_name(&(trn->name    [total]),
+                                   &(trn->uni_name[total]),
+                                   sid_name_use, name, dom_idx);
+               total++;
        }
 
-       trn->num_entries = (*total);
+       trn->num_entries = total;
        trn->ptr_trans_names = 1;
-       trn->num_entries2 = (*total);
+       trn->num_entries2 = total;
 }
 
 /***************************************************************************
@@ -240,9 +368,7 @@ static void make_reply_lookup_sids(LSA_R_LOOKUP_SIDS *r_l,
 lsa_reply_lookup_sids
  ***************************************************************************/
 static void lsa_reply_lookup_sids(prs_struct *rdata,
-                               int num_entries, DOM_SID2 sid[MAX_LOOKUP_SIDS],
-                               char *dom_name, DOM_SID *dom_sid,
-                               DOM_SID *other_sid1, DOM_SID *other_sid2, DOM_SID *other_sid3)
+                               DOM_SID2 *sid, int num_entries)
 {
        LSA_R_LOOKUP_SIDS r_l;
        DOM_R_REF ref;
@@ -254,8 +380,7 @@ static void lsa_reply_lookup_sids(prs_struct *rdata,
        ZERO_STRUCT(names);
 
        /* set up the LSA Lookup SIDs response */
-       make_dom_ref(&ref, dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
-       make_lsa_trans_names(&names, num_entries, sid, &mapped_count);
+       make_lsa_trans_names(&ref, &names, num_entries, sid, &mapped_count);
        make_reply_lookup_sids(&r_l, &ref, &names, mapped_count, 0x0);
 
        /* store the response in the SMB stream */
@@ -263,30 +388,55 @@ static void lsa_reply_lookup_sids(prs_struct *rdata,
 }
 
 /***************************************************************************
-lsa_reply_lookup_rids
+lsa_reply_lookup_names
  ***************************************************************************/
-static void lsa_reply_lookup_rids(prs_struct *rdata,
-                               int num_entries, uint32 dom_rids[MAX_LOOKUP_SIDS],
-                               char *dom_name, DOM_SID *dom_sid,
-                               DOM_SID *other_sid1, DOM_SID *other_sid2, DOM_SID *other_sid3)
+static void lsa_reply_lookup_names(prs_struct *rdata,
+                               UNISTR2 names[MAX_LOOKUP_SIDS], int num_entries)
 {
-       LSA_R_LOOKUP_RIDS r_l;
+       LSA_R_LOOKUP_NAMES r_l;
+       DOM_R_REF ref;
+       DOM_RID2 rids[MAX_LOOKUP_SIDS];
+       uint32 mapped_count = 0;
 
        ZERO_STRUCT(r_l);
+       ZERO_STRUCT(ref);
+       ZERO_STRUCT(rids);
 
        /* set up the LSA Lookup RIDs response */
-       make_reply_lookup_rids(&r_l, num_entries, dom_rids,
-                               dom_name, dom_sid, other_sid1, other_sid2, other_sid3);
-       r_l.status = 0x0;
+       make_lsa_rid2s(&ref, rids, num_entries, names, &mapped_count);
+       make_reply_lookup_names(&r_l, &ref, rids, mapped_count, 0x0);
+
+       r_l.num_entries  = num_entries;
+       r_l.undoc_buffer = 1;
+       r_l.num_entries2 = num_entries;
 
        /* store the response in the SMB stream */
-       lsa_io_r_lookup_rids("", &r_l, rdata, 0);
+       lsa_io_r_lookup_names("", &r_l, rdata, 0);
 }
 
 /***************************************************************************
 api_lsa_open_policy
  ***************************************************************************/
-static void api_lsa_open_policy( int uid, prs_struct *data,
+static void api_lsa_open_policy2( uint16 vuid, prs_struct *data,
+                             prs_struct *rdata )
+{
+       LSA_Q_OPEN_POL2 q_o;
+
+       ZERO_STRUCT(q_o);
+
+       /* grab the server, object attributes and desired access flag...*/
+       lsa_io_q_open_pol2("", &q_o, data, 0);
+
+       /* lkclXXXX having decoded it, ignore all fields in the open policy! */
+
+       /* return a 20 byte policy handle */
+       lsa_reply_open_policy2(rdata);
+}
+
+/***************************************************************************
+api_lsa_open_policy
+ ***************************************************************************/
+static void api_lsa_open_policy( uint16 vuid, prs_struct *data,
                              prs_struct *rdata )
 {
        LSA_Q_OPEN_POL q_o;
@@ -305,7 +455,7 @@ static void api_lsa_open_policy( int uid, prs_struct *data,
 /***************************************************************************
 api_lsa_enum_trust_dom
  ***************************************************************************/
-static void api_lsa_enum_trust_dom( int uid, prs_struct *data,
+static void api_lsa_enum_trust_dom( uint16 vuid, prs_struct *data,
                                     prs_struct *rdata )
 {
        LSA_Q_ENUM_TRUST_DOM q_e;
@@ -316,139 +466,106 @@ static void api_lsa_enum_trust_dom( int uid, prs_struct *data,
        lsa_io_q_enum_trust_dom("", &q_e, data, 0);
 
        /* construct reply.  return status is always 0x0 */
-       lsa_reply_enum_trust_dom(&q_e, rdata,
-                                             0, NULL, NULL);
+       lsa_reply_enum_trust_dom(&q_e, rdata, 0, NULL, NULL);
 }
 
 /***************************************************************************
 api_lsa_query_info
  ***************************************************************************/
-static void api_lsa_query_info( int uid, prs_struct *data,
+static void api_lsa_query_info( uint16 vuid, prs_struct *data,
                                 prs_struct *rdata )
 {
        LSA_Q_QUERY_INFO q_i;
-       pstring dom_name;
+       fstring name;
+       DOM_SID *sid = NULL;
+       memset(name, 0, sizeof(name));
 
        ZERO_STRUCT(q_i);
 
        /* grab the info class and policy handle */
        lsa_io_q_query("", &q_i, data, 0);
 
-       pstrcpy(dom_name, lp_workgroup());
+       switch (q_i.info_class)
+       {
+               case 0x03:
+               {
+                       fstrcpy(name, global_myworkgroup);
+                       sid = &global_member_sid;
+                       break;
+               }
+               case 0x05:
+               {
+                       fstrcpy(name, global_sam_name);
+                       sid = &global_sam_sid;
+                       break;
+               }
+               default:
+               {
+                       DEBUG(5,("unknown info level in Lsa Query: %d\n",
+                                 q_i.info_class));
+                       break;
+               }
+       }
 
        /* construct reply.  return status is always 0x0 */
-       lsa_reply_query_info(&q_i, rdata, dom_name, &global_machine_sid);
+       lsa_reply_query_info(&q_i, rdata, name, sid);
 }
 
 /***************************************************************************
 api_lsa_lookup_sids
  ***************************************************************************/
-static void api_lsa_lookup_sids( int uid, prs_struct *data,
+static void api_lsa_lookup_sids( uint16 vuid, prs_struct *data,
                                  prs_struct *rdata )
 {
        LSA_Q_LOOKUP_SIDS q_l;
-       pstring dom_name;
-       DOM_SID sid_S_1_1;
-       DOM_SID sid_S_1_3;
-       DOM_SID sid_S_1_5;
-
        ZERO_STRUCT(q_l);
-       ZERO_STRUCT(sid_S_1_1);
-       ZERO_STRUCT(sid_S_1_3);
-       ZERO_STRUCT(sid_S_1_5);
 
        /* grab the info class and policy handle */
        lsa_io_q_lookup_sids("", &q_l, data, 0);
 
-       pstrcpy(dom_name, lp_workgroup());
-
-       string_to_sid(&sid_S_1_1, "S-1-1");
-        string_to_sid(&sid_S_1_3, "S-1-3");
-        string_to_sid(&sid_S_1_5, "S-1-5");
-
        /* construct reply.  return status is always 0x0 */
-       lsa_reply_lookup_sids(rdata,
-                              q_l.sids.num_entries, q_l.sids.sid, /* SIDs */
-                              dom_name, &global_machine_sid, /* domain name, domain SID */
-                              &sid_S_1_1, &sid_S_1_3, &sid_S_1_5); /* the three other SIDs */
+       lsa_reply_lookup_sids(rdata, q_l.sids.sid, q_l.sids.num_entries);
 }
 
 /***************************************************************************
 api_lsa_lookup_names
  ***************************************************************************/
-static void api_lsa_lookup_names( int uid, prs_struct *data,
+static void api_lsa_lookup_names( uint16 vuid, prs_struct *data,
                                   prs_struct *rdata )
 {
-       int i;
-       LSA_Q_LOOKUP_RIDS q_l;
-       pstring dom_name;
-       DOM_SID sid_S_1_1;
-       DOM_SID sid_S_1_3;
-       DOM_SID sid_S_1_5;
-       uint32 dom_rids[MAX_LOOKUP_SIDS];
-       uint32 dummy_g_rid;
-
+       LSA_Q_LOOKUP_NAMES q_l;
        ZERO_STRUCT(q_l);
-       ZERO_STRUCT(sid_S_1_1);
-       ZERO_STRUCT(sid_S_1_3);
-       ZERO_STRUCT(sid_S_1_5);
-       ZERO_STRUCT(dom_rids);  
 
        /* grab the info class and policy handle */
-       lsa_io_q_lookup_rids("", &q_l, data, 0);
-
-       pstrcpy(dom_name, lp_workgroup());
+       lsa_io_q_lookup_names("", &q_l, data, 0);
 
-       string_to_sid(&sid_S_1_1, "S-1-1");
-        string_to_sid(&sid_S_1_3, "S-1-3");
-        string_to_sid(&sid_S_1_5, "S-1-5");
-
-       SMB_ASSERT_ARRAY(q_l.lookup_name, q_l.num_entries);
-
-       /* convert received RIDs to strings, so we can do them. */
-       for (i = 0; i < q_l.num_entries; i++)
-       {
-        fstring user_name;
-               fstrcpy(user_name, unistr2(q_l.lookup_name[i].str.buffer));
-        /*
-         * Map to the UNIX username.
-         */
-        map_username(user_name);
-
-        /*
-         * Do any case conversions.
-         */
-        (void)Get_Pwnam(user_name, True);
-
-               if (!pdb_name_to_rid(user_name, &dom_rids[i], &dummy_g_rid))
-               {
-                       /* WHOOPS!  we should really do something about this... */
-                       dom_rids[i] = 0;
-               }
-       }
+       SMB_ASSERT_ARRAY(q_l.uni_name, q_l.num_entries);
 
        /* construct reply.  return status is always 0x0 */
-       lsa_reply_lookup_rids(rdata,
-                              q_l.num_entries, dom_rids, /* text-converted SIDs */
-                              dom_name, &global_machine_sid, /* domain name, domain SID */
-                              &sid_S_1_1, &sid_S_1_3, &sid_S_1_5); /* the three other SIDs */
+       lsa_reply_lookup_names(rdata, q_l.uni_name, q_l.num_entries);
 }
 
 /***************************************************************************
  api_lsa_close
  ***************************************************************************/
-static void api_lsa_close( int uid, prs_struct *data,
+static void api_lsa_close( uint16 vuid, prs_struct *data,
                                   prs_struct *rdata)
 {
        /* XXXX this is NOT good */
        char *q = mem_data(&(rdata->data), rdata->offset);
 
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0); 
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
 
        rdata->offset += 24;
 }
@@ -456,18 +573,24 @@ static void api_lsa_close( int uid, prs_struct *data,
 /***************************************************************************
  api_lsa_open_secret
  ***************************************************************************/
-static void api_lsa_open_secret( int uid, prs_struct *data,
+static void api_lsa_open_secret( uint16 vuid, prs_struct *data,
                                   prs_struct *rdata)
 {
        /* XXXX this is NOT good */
        char *q = mem_data(&(rdata->data), rdata->offset);
 
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0); q += 4;
-       SIVAL(q, 0, 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND); q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0);
+       q += 4;
+       SIVAL(q, 0, 0xC0000000 | NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       q += 4;
        
        rdata->offset += 24;
 }
@@ -477,6 +600,7 @@ static void api_lsa_open_secret( int uid, prs_struct *data,
  ***************************************************************************/
 static struct api_struct api_lsa_cmds[] =
 {
+       { "LSA_OPENPOLICY2"     , LSA_OPENPOLICY2     , api_lsa_open_policy2   },
        { "LSA_OPENPOLICY"      , LSA_OPENPOLICY      , api_lsa_open_policy    },
        { "LSA_QUERYINFOPOLICY" , LSA_QUERYINFOPOLICY , api_lsa_query_info     },
        { "LSA_ENUMTRUSTDOM"    , LSA_ENUMTRUSTDOM    , api_lsa_enum_trust_dom },
@@ -494,4 +618,3 @@ BOOL api_ntlsa_rpc(pipes_struct *p, prs_struct *data)
 {
        return api_rpcTNP(p, "api_ntlsa_rpc", api_lsa_cmds, data);
 }
-