Remove unused marshalling for LSA_LOOKUP_NAMES/2/3/4

Guenther

diff --git a/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index dde014a4cc1806d77ff7205f02170a30d5f472f4..a92fca817da4a5cffce45c94438ed5b96c5daf0d 100644 (file)
--- a/source/include/rpc_lsa.h
+++ b/source/include/rpc_lsa.h
@@ -305,145 +305,4 @@ typedef struct lsa_r_lookup_sids3
 
 } LSA_R_LOOKUP_SIDS3;
 
-/* LSA_Q_LOOKUP_NAMES - LSA Lookup NAMEs */
-typedef struct lsa_q_lookup_names
-{
-       POLICY_HND pol; /* policy handle */
-       uint32 num_entries;
-       uint32 num_entries2;
-       UNIHDR  *hdr_name; /* name buffer pointers */
-       UNISTR2 *uni_name; /* names to be looked up */
-
-       uint32 num_trans_entries;
-       uint32 ptr_trans_sids; /* undocumented domain SID buffer pointer */
-       uint16 lookup_level;
-       uint32 mapped_count;
-
-} LSA_Q_LOOKUP_NAMES;
-
-/* LSA_R_LOOKUP_NAMES - response to LSA Lookup NAMEs by name */
-typedef struct lsa_r_lookup_names
-{
-       uint32 ptr_dom_ref;
-       DOM_R_REF *dom_ref; /* domain reference info */
-
-       uint32 num_entries;
-       uint32 ptr_entries;
-       uint32 num_entries2;
-       DOM_RID *dom_rid; /* domain RIDs being looked up */
-
-       uint32 mapped_count;
-
-       NTSTATUS status; /* return code */
-} LSA_R_LOOKUP_NAMES;
-
-/* LSA_Q_LOOKUP_NAMES2 - LSA Lookup NAMEs 2*/
-typedef struct lsa_q_lookup_names2
-{
-       POLICY_HND pol; /* policy handle */
-       uint32 num_entries;
-       uint32 num_entries2;
-       UNIHDR  *hdr_name; /* name buffer pointers */
-       UNISTR2 *uni_name; /* names to be looked up */
-
-       uint32 num_trans_entries;
-       uint32 ptr_trans_sids; /* undocumented domain SID buffer pointer */
-       uint16 lookup_level;
-       uint32 mapped_count;
-       uint32 unknown1;
-       uint32 unknown2;
-
-} LSA_Q_LOOKUP_NAMES2;
-
-/* LSA_R_LOOKUP_NAMES2 - response to LSA Lookup NAMEs by name 2 */
-typedef struct lsa_r_lookup_names2
-{
-       uint32 ptr_dom_ref;
-       DOM_R_REF *dom_ref; /* domain reference info */
-
-       uint32 num_entries;
-       uint32 ptr_entries;
-       uint32 num_entries2;
-       DOM_RID2 *dom_rid; /* domain RIDs being looked up */
-
-       uint32 mapped_count;
-
-       NTSTATUS status; /* return code */
-} LSA_R_LOOKUP_NAMES2;
-
-/* LSA_Q_LOOKUP_NAMES3 - LSA Lookup NAMEs 3 */
-typedef struct lsa_q_lookup_names3
-{
-       POLICY_HND pol; /* policy handle */
-       uint32 num_entries;
-       uint32 num_entries2;
-       UNIHDR  *hdr_name; /* name buffer pointers */
-       UNISTR2 *uni_name; /* names to be looked up */
-
-       uint32 num_trans_entries;
-       uint32 ptr_trans_sids; /* undocumented domain SID buffer pointer */
-       uint16 lookup_level;
-       uint32 mapped_count;
-       uint32 unknown1;
-       uint32 unknown2;
-
-} LSA_Q_LOOKUP_NAMES3;
-
-/* Sid type used in lookupnames3 and lookupnames4. */
-typedef struct lsa_translatedsid3 {
-       uint8 sid_type;
-       DOM_SID2 *sid2;
-       uint32 sid_idx;
-       uint32 unknown;
-} LSA_TRANSLATED_SID3;
-
-/* LSA_R_LOOKUP_NAMES3 - response to LSA Lookup NAMEs by name 3 */
-typedef struct lsa_r_lookup_names3
-{
-       uint32 ptr_dom_ref;
-       DOM_R_REF *dom_ref; /* domain reference info */
-
-       uint32 num_entries;
-       uint32 ptr_entries;
-       uint32 num_entries2;
-       LSA_TRANSLATED_SID3 *trans_sids;
-
-       uint32 mapped_count;
-
-       NTSTATUS status; /* return code */
-} LSA_R_LOOKUP_NAMES3;
-
-/* LSA_Q_LOOKUP_NAMES4 - LSA Lookup NAMEs 4 */
-typedef struct lsa_q_lookup_names4
-{
-       uint32 num_entries;
-       uint32 num_entries2;
-       UNIHDR  *hdr_name; /* name buffer pointers */
-       UNISTR2 *uni_name; /* names to be looked up */
-
-       uint32 num_trans_entries;
-       uint32 ptr_trans_sids; /* undocumented domain SID buffer pointer */
-       uint16 lookup_level;
-       uint32 mapped_count;
-       uint32 unknown1;
-       uint32 unknown2;
-
-} LSA_Q_LOOKUP_NAMES4;
-
-/* LSA_R_LOOKUP_NAMES3 - response to LSA Lookup NAMEs by name 4 */
-typedef struct lsa_r_lookup_names4
-{
-       uint32 ptr_dom_ref;
-       DOM_R_REF *dom_ref; /* domain reference info */
-
-       uint32 num_entries;
-       uint32 ptr_entries;
-       uint32 num_entries2;
-       LSA_TRANSLATED_SID3 *trans_sids;
-
-       uint32 mapped_count;
-
-       NTSTATUS status; /* return code */
-} LSA_R_LOOKUP_NAMES4;
-
 #endif /* _RPC_LSA_H */

diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c
index 3d65b9ca3ba10f921d3a8cae404600135bd09def..81b6fc9e130f446e059c1ac63c2e03592146af80 100644 (file)
--- a/source/rpc_parse/parse_lsa.c
+++ b/source/rpc_parse/parse_lsa.c
@@ -628,581 +628,3 @@ bool lsa_io_r_lookup_sids3(const char *desc, LSA_R_LOOKUP_SIDS3 *r_s,
 
        return True;
 }
-
-/*******************************************************************
-makes a structure.
-********************************************************************/
-
-void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l, 
-                        POLICY_HND *hnd, int num_names, const char **names, 
-                        int level)
-{
-       unsigned int i;
-
-       DEBUG(5, ("init_q_lookup_names\n"));
-
-       ZERO_STRUCTP(q_l);
-
-       q_l->pol = *hnd;
-       q_l->num_entries = num_names;
-       q_l->num_entries2 = num_names;
-       q_l->lookup_level = level;
-
-       if (num_names) {
-               if ((q_l->uni_name = TALLOC_ZERO_ARRAY(mem_ctx, UNISTR2, num_names)) == NULL) {
-                       DEBUG(3, ("init_q_lookup_names(): out of memory\n"));
-                       return;
-               }
-
-               if ((q_l->hdr_name = TALLOC_ZERO_ARRAY(mem_ctx, UNIHDR, num_names)) == NULL) {
-                       DEBUG(3, ("init_q_lookup_names(): out of memory\n"));
-                       return;
-               }
-       } else {
-               q_l->uni_name = NULL;
-               q_l->hdr_name = NULL;
-       }
-
-       for (i = 0; i < num_names; i++) {
-               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]);
-       }
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool lsa_io_q_lookup_names(const char *desc, LSA_Q_LOOKUP_NAMES *q_r, 
-                          prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_names");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("", &q_r->pol, ps, depth)) /* policy handle */
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_entries    ", ps, depth, &q_r->num_entries))
-               return False;
-       if(!prs_uint32("num_entries2   ", ps, depth, &q_r->num_entries2))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (q_r->num_entries) {
-                       if ((q_r->hdr_name = PRS_ALLOC_MEM(ps, UNIHDR, q_r->num_entries)) == NULL)
-                               return False;
-                       if ((q_r->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, q_r->num_entries)) == NULL)
-                               return False;
-               }
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unihdr("hdr_name", &q_r->hdr_name[i], ps, depth)) /* pointer names */
-                       return False;
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unistr2("dom_name", &q_r->uni_name[i], q_r->hdr_name[i].buffer, ps, depth)) /* names to be looked up */
-                       return False;
-       }
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_trans_entries ", ps, depth, &q_r->num_trans_entries))
-               return False;
-       if(!prs_uint32("ptr_trans_sids ", ps, depth, &q_r->ptr_trans_sids))
-               return False;
-       if(!prs_uint16("lookup_level   ", ps, depth, &q_r->lookup_level))
-               return False;
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("mapped_count   ", ps, depth, &q_r->mapped_count))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool lsa_io_r_lookup_names(const char *desc, LSA_R_LOOKUP_NAMES *out, prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_lookup_names");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_dom_ref", ps, depth, &out->ptr_dom_ref))
-               return False;
-
-       if (out->ptr_dom_ref != 0)
-               if(!lsa_io_dom_r_ref("", out->dom_ref, ps, depth))
-                       return False;
-
-       if(!prs_uint32("num_entries", ps, depth, &out->num_entries))
-               return False;
-       if(!prs_uint32("ptr_entries", ps, depth, &out->ptr_entries))
-               return False;
-
-       if (out->ptr_entries != 0) {
-               if(!prs_uint32("num_entries2", ps, depth, &out->num_entries2))
-                       return False;
-
-               if (out->num_entries2 != out->num_entries) {
-                       /* RPC fault */
-                       return False;
-               }
-
-               if (UNMARSHALLING(ps) && out->num_entries2) {
-                       if ((out->dom_rid = PRS_ALLOC_MEM(ps, DOM_RID, out->num_entries2))
-                           == NULL) {
-                               DEBUG(3, ("lsa_io_r_lookup_names(): out of memory\n"));
-                               return False;
-                       }
-               }
-
-               for (i = 0; i < out->num_entries2; i++)
-                       if(!smb_io_dom_rid("", &out->dom_rid[i], ps, depth)) /* domain RIDs being looked up */
-                               return False;
-       }
-
-       if(!prs_uint32("mapped_count", ps, depth, &out->mapped_count))
-               return False;
-
-       if(!prs_ntstatus("status      ", ps, depth, &out->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool lsa_io_q_lookup_names2(const char *desc, LSA_Q_LOOKUP_NAMES2 *q_r, 
-                          prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_names2");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("", &q_r->pol, ps, depth)) /* policy handle */
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_entries    ", ps, depth, &q_r->num_entries))
-               return False;
-       if(!prs_uint32("num_entries2   ", ps, depth, &q_r->num_entries2))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (q_r->num_entries) {
-                       if ((q_r->hdr_name = PRS_ALLOC_MEM(ps, UNIHDR, q_r->num_entries)) == NULL)
-                               return False;
-                       if ((q_r->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, q_r->num_entries)) == NULL)
-                               return False;
-               }
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unihdr("hdr_name", &q_r->hdr_name[i], ps, depth)) /* pointer names */
-                       return False;
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unistr2("dom_name", &q_r->uni_name[i], q_r->hdr_name[i].buffer, ps, depth)) /* names to be looked up */
-                       return False;
-       }
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_trans_entries ", ps, depth, &q_r->num_trans_entries))
-               return False;
-       if(!prs_uint32("ptr_trans_sids ", ps, depth, &q_r->ptr_trans_sids))
-               return False;
-       if(!prs_uint16("lookup_level   ", ps, depth, &q_r->lookup_level))
-               return False;
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("mapped_count   ", ps, depth, &q_r->mapped_count))
-               return False;
-       if(!prs_uint32("unknown1   ", ps, depth, &q_r->unknown1))
-               return False;
-       if(!prs_uint32("unknown2   ", ps, depth, &q_r->unknown2))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool lsa_io_r_lookup_names2(const char *desc, LSA_R_LOOKUP_NAMES2 *out, prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_lookup_names2");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_dom_ref", ps, depth, &out->ptr_dom_ref))
-               return False;
-
-       if (out->ptr_dom_ref != 0)
-               if(!lsa_io_dom_r_ref("", out->dom_ref, ps, depth))
-                       return False;
-
-       if(!prs_uint32("num_entries", ps, depth, &out->num_entries))
-               return False;
-       if(!prs_uint32("ptr_entries", ps, depth, &out->ptr_entries))
-               return False;
-
-       if (out->ptr_entries != 0) {
-               if(!prs_uint32("num_entries2", ps, depth, &out->num_entries2))
-                       return False;
-
-               if (out->num_entries2 != out->num_entries) {
-                       /* RPC fault */
-                       return False;
-               }
-
-               if (UNMARSHALLING(ps) && out->num_entries2) {
-                       if ((out->dom_rid = PRS_ALLOC_MEM(ps, DOM_RID2, out->num_entries2))
-                           == NULL) {
-                               DEBUG(3, ("lsa_io_r_lookup_names2(): out of memory\n"));
-                               return False;
-                       }
-               }
-
-               for (i = 0; i < out->num_entries2; i++)
-                       if(!smb_io_dom_rid2("", &out->dom_rid[i], ps, depth)) /* domain RIDs being looked up */
-                               return False;
-       }
-
-       if(!prs_uint32("mapped_count", ps, depth, &out->mapped_count))
-               return False;
-
-       if(!prs_ntstatus("status      ", ps, depth, &out->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Internal lsa data type io.
- Following pass must read DOM_SID2 types.
-********************************************************************/
-
-bool smb_io_lsa_translated_sids3(const char *desc, LSA_TRANSLATED_SID3 *q_r, 
-                          prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "smb_io_lsa_translated_sids3");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint8 ("sid_type ", ps, depth, &q_r->sid_type ))
-               return False;
-       if(!prs_align(ps))
-               return False;
-       /* Second pass will read/write these. */
-       if (!smb_io_dom_sid2_p("sid_header", ps, depth, &q_r->sid2))
-               return False;
-       if(!prs_uint32("sid_idx ", ps, depth, &q_r->sid_idx ))
-               return False;
-       if(!prs_uint32("unknown ", ps, depth, &q_r->unknown ))
-               return False;
-       
-       return True;
-}
-
-/*******************************************************************
- Identical to lsa_io_q_lookup_names2.
-********************************************************************/
-
-bool lsa_io_q_lookup_names3(const char *desc, LSA_Q_LOOKUP_NAMES3 *q_r, 
-                          prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_names3");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("", &q_r->pol, ps, depth)) /* policy handle */
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_entries    ", ps, depth, &q_r->num_entries))
-               return False;
-       if(!prs_uint32("num_entries2   ", ps, depth, &q_r->num_entries2))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (q_r->num_entries) {
-                       if ((q_r->hdr_name = PRS_ALLOC_MEM(ps, UNIHDR, q_r->num_entries)) == NULL)
-                               return False;
-                       if ((q_r->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, q_r->num_entries)) == NULL)
-                               return False;
-               }
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unihdr("hdr_name", &q_r->hdr_name[i], ps, depth)) /* pointer names */
-                       return False;
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unistr2("dom_name", &q_r->uni_name[i], q_r->hdr_name[i].buffer, ps, depth)) /* names to be looked up */
-                       return False;
-       }
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_trans_entries ", ps, depth, &q_r->num_trans_entries))
-               return False;
-       if(!prs_uint32("ptr_trans_sids ", ps, depth, &q_r->ptr_trans_sids))
-               return False;
-       if(!prs_uint16("lookup_level   ", ps, depth, &q_r->lookup_level))
-               return False;
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("mapped_count   ", ps, depth, &q_r->mapped_count))
-               return False;
-       if(!prs_uint32("unknown1   ", ps, depth, &q_r->unknown1))
-               return False;
-       if(!prs_uint32("unknown2   ", ps, depth, &q_r->unknown2))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool lsa_io_r_lookup_names3(const char *desc, LSA_R_LOOKUP_NAMES3 *out, prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_lookup_names3");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_dom_ref", ps, depth, &out->ptr_dom_ref))
-               return False;
-
-       if (out->ptr_dom_ref != 0)
-               if(!lsa_io_dom_r_ref("", out->dom_ref, ps, depth))
-                       return False;
-
-       if(!prs_uint32("num_entries", ps, depth, &out->num_entries))
-               return False;
-       if(!prs_uint32("ptr_entries", ps, depth, &out->ptr_entries))
-               return False;
-
-       if (out->ptr_entries != 0) {
-               if(!prs_uint32("num_entries2", ps, depth, &out->num_entries2))
-                       return False;
-
-               if (out->num_entries2 != out->num_entries) {
-                       /* RPC fault */
-                       return False;
-               }
-
-               if (UNMARSHALLING(ps) && out->num_entries2) {
-                       if ((out->trans_sids = PRS_ALLOC_MEM(ps, LSA_TRANSLATED_SID3, out->num_entries2))
-                           == NULL) {
-                               DEBUG(3, ("lsa_io_r_lookup_names3(): out of memory\n"));
-                               return False;
-                       }
-               }
-
-               for (i = 0; i < out->num_entries2; i++) {
-                       if(!smb_io_lsa_translated_sids3("", &out->trans_sids[i], ps, depth)) {
-                               return False;
-                       }
-               }
-               /* Now process the DOM_SID2 entries. */
-               for (i = 0; i < out->num_entries2; i++) {
-                       if (out->trans_sids[i].sid2) {
-                               if( !smb_io_dom_sid2("sid2", out->trans_sids[i].sid2, ps, depth) ) {
-                                       return False;
-                               }
-                       }
-               }
-       }
-
-       if(!prs_uint32("mapped_count", ps, depth, &out->mapped_count))
-               return False;
-
-       if(!prs_ntstatus("status      ", ps, depth, &out->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool lsa_io_q_lookup_names4(const char *desc, LSA_Q_LOOKUP_NAMES4 *q_r, 
-                          prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_q_lookup_names4");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("num_entries    ", ps, depth, &q_r->num_entries))
-               return False;
-       if(!prs_uint32("num_entries2   ", ps, depth, &q_r->num_entries2))
-               return False;
-
-       if (UNMARSHALLING(ps)) {
-               if (q_r->num_entries) {
-                       if ((q_r->hdr_name = PRS_ALLOC_MEM(ps, UNIHDR, q_r->num_entries)) == NULL)
-                               return False;
-                       if ((q_r->uni_name = PRS_ALLOC_MEM(ps, UNISTR2, q_r->num_entries)) == NULL)
-                               return False;
-               }
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unihdr("hdr_name", &q_r->hdr_name[i], ps, depth)) /* pointer names */
-                       return False;
-       }
-
-       for (i = 0; i < q_r->num_entries; i++) {
-               if(!prs_align(ps))
-                       return False;
-               if(!smb_io_unistr2("dom_name", &q_r->uni_name[i], q_r->hdr_name[i].buffer, ps, depth)) /* names to be looked up */
-                       return False;
-       }
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("num_trans_entries ", ps, depth, &q_r->num_trans_entries))
-               return False;
-       if(!prs_uint32("ptr_trans_sids ", ps, depth, &q_r->ptr_trans_sids))
-               return False;
-       if(!prs_uint16("lookup_level   ", ps, depth, &q_r->lookup_level))
-               return False;
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("mapped_count   ", ps, depth, &q_r->mapped_count))
-               return False;
-       if(!prs_uint32("unknown1   ", ps, depth, &q_r->unknown1))
-               return False;
-       if(!prs_uint32("unknown2   ", ps, depth, &q_r->unknown2))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Identical to lsa_io_r_lookup_names3.
-********************************************************************/
-
-bool lsa_io_r_lookup_names4(const char *desc, LSA_R_LOOKUP_NAMES4 *out, prs_struct *ps, int depth)
-{
-       unsigned int i;
-
-       prs_debug(ps, depth, desc, "lsa_io_r_lookup_names4");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("ptr_dom_ref", ps, depth, &out->ptr_dom_ref))
-               return False;
-
-       if (out->ptr_dom_ref != 0)
-               if(!lsa_io_dom_r_ref("", out->dom_ref, ps, depth))
-                       return False;
-
-       if(!prs_uint32("num_entries", ps, depth, &out->num_entries))
-               return False;
-       if(!prs_uint32("ptr_entries", ps, depth, &out->ptr_entries))
-               return False;
-
-       if (out->ptr_entries != 0) {
-               if(!prs_uint32("num_entries2", ps, depth, &out->num_entries2))
-                       return False;
-
-               if (out->num_entries2 != out->num_entries) {
-                       /* RPC fault */
-                       return False;
-               }
-
-               if (UNMARSHALLING(ps) && out->num_entries2) {
-                       if ((out->trans_sids = PRS_ALLOC_MEM(ps, LSA_TRANSLATED_SID3, out->num_entries2))
-                           == NULL) {
-                               DEBUG(3, ("lsa_io_r_lookup_names4(): out of memory\n"));
-                               return False;
-                       }
-               }
-
-               for (i = 0; i < out->num_entries2; i++) {
-                       if(!smb_io_lsa_translated_sids3("", &out->trans_sids[i], ps, depth)) {
-                               return False;
-                       }
-               }
-               /* Now process the DOM_SID2 entries. */
-               for (i = 0; i < out->num_entries2; i++) {
-                       if (out->trans_sids[i].sid2) {
-                               if( !smb_io_dom_sid2("sid2", out->trans_sids[i].sid2, ps, depth) ) {
-                                       return False;
-                               }
-                       }
-               }
-       }
-
-       if(!prs_uint32("mapped_count", ps, depth, &out->mapped_count))
-               return False;
-
-       if(!prs_ntstatus("status      ", ps, depth, &out->status))
-               return False;
-
-       return True;
-}

diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 5a3ed28e88b35af02807eede9df02ecfaaaabc61..73238a5f6fe0b96065c78b0fc125813bc96bed09 100644 (file)
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -316,82 +316,6 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-/***************************************************************************
- init_reply_lookup_names
- ***************************************************************************/
-
-static void init_reply_lookup_names(LSA_R_LOOKUP_NAMES *r_l,
-                DOM_R_REF *ref, uint32 num_entries,
-                DOM_RID *rid, uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
-
-       r_l->num_entries  = num_entries;
-       r_l->ptr_entries  = 1;
-       r_l->num_entries2 = num_entries;
-       r_l->dom_rid      = rid;
-
-       r_l->mapped_count = mapped_count;
-}
-
-/***************************************************************************
- init_reply_lookup_names2
- ***************************************************************************/
-
-static void init_reply_lookup_names2(LSA_R_LOOKUP_NAMES2 *r_l,
-                DOM_R_REF *ref, uint32 num_entries,
-                DOM_RID2 *rid, uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
-
-       r_l->num_entries  = num_entries;
-       r_l->ptr_entries  = 1;
-       r_l->num_entries2 = num_entries;
-       r_l->dom_rid      = rid;
-
-       r_l->mapped_count = mapped_count;
-}
-
-/***************************************************************************
- init_reply_lookup_names3
- ***************************************************************************/
-
-static void init_reply_lookup_names3(LSA_R_LOOKUP_NAMES3 *r_l,
-                DOM_R_REF *ref, uint32 num_entries,
-                LSA_TRANSLATED_SID3 *trans_sids, uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
-
-       r_l->num_entries  = num_entries;
-       r_l->ptr_entries  = 1;
-       r_l->num_entries2 = num_entries;
-       r_l->trans_sids   = trans_sids;
-
-       r_l->mapped_count = mapped_count;
-}
-
-/***************************************************************************
- init_reply_lookup_names4
- ***************************************************************************/
-
-static void init_reply_lookup_names4(LSA_R_LOOKUP_NAMES4 *r_l,
-                DOM_R_REF *ref, uint32 num_entries,
-                LSA_TRANSLATED_SID3 *trans_sids, uint32 mapped_count)
-{
-       r_l->ptr_dom_ref  = 1;
-       r_l->dom_ref      = ref;
-
-       r_l->num_entries  = num_entries;
-       r_l->ptr_entries  = 1;
-       r_l->num_entries2 = num_entries;
-       r_l->trans_sids   = trans_sids;
-
-       r_l->mapped_count = mapped_count;
-}
-
 /***************************************************************************
  Init_reply_lookup_sids.
  ***************************************************************************/