r6228: remove BUFHDR2 and clean up LsaEnumTrustedDomains()

Tested client and server code.
(This used to be commit efb3ac4c69c72c0fa01c558951fa357893562bce)

2 files changed, 25 insertions, 30 deletions

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 69d8f53a6d..8eaf68a234 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -1,9 +1,10 @@
 /* 
    Unix SMB/CIFS implementation.
    SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
+   Copyright (C) Andrew Tridgell               1992-1997
+   Copyright (C) Luke Kenneth Casson Leighton  1996-1997
+   Copyright (C) Paul Ashton                   1997
+   Copyright (C) Gerald (Jerry) Carter         2005
    
    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
@@ -305,32 +306,33 @@ typedef struct lsa_r_query_info2
 	NTSTATUS status;
 } LSA_R_QUERY_INFO2;
 
-/* LSA_Q_ENUM_TRUST_DOM - LSA enumerate trusted domains */
-typedef struct lsa_enum_trust_dom_info
-{
-	POLICY_HND pol; /* policy handle */
-	uint32 enum_context; /* enumeration context handle */
-	uint32 preferred_len; /* preferred maximum length */
+/*******************************************************/
 
+typedef struct {
+	POLICY_HND pol; 
+	uint32 enum_context; 
+	uint32 preferred_len; 	/* preferred maximum length */
 } LSA_Q_ENUM_TRUST_DOM;
 
-/* LSA_R_ENUM_TRUST_DOM - response to LSA enumerate trusted domains */
-typedef struct lsa_r_enum_trust_dom_info
-{
-	uint32 enum_context; /* enumeration context handle */
-	uint32 num_domains; /* number of domains */
-	uint32 ptr_enum_domains; /* buffer pointer to num domains */
-
-	/* this lot is only added if ptr_enum_domains is non-NULL */
-	uint32 num_domains2; /* number of domains */
-	UNIHDR2 *hdr_domain_name;
-	UNISTR2 *uni_domain_name;
-	DOM_SID2 *domain_sid;
+typedef struct {
+	UNISTR4	name;
+	DOM_SID2 *sid;
+} DOMAIN_INFO;
 
-	NTSTATUS status; /* return code */
+typedef struct {
+	uint32 count;
+	DOMAIN_INFO *domains;
+} DOMAIN_LIST;
 
+typedef struct {
+	uint32 enum_context;
+	uint32 count;
+	DOMAIN_LIST *domlist;
+	NTSTATUS status; 
 } LSA_R_ENUM_TRUST_DOM;
 
+/*******************************************************/
+
 /* LSA_Q_CLOSE */
 typedef struct lsa_q_close_info
 {
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 3cece400db..e93d6610ba 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -215,13 +215,6 @@ typedef struct {
 	uint32 buffer; 
 } UNIHDR;
 
-typedef struct {
-	UNIHDR unihdr;
-	uint32 buffer; /* 32 bit buffer pointer */
-} UNIHDR2;
-
-
-
 /********************************************************************** 
  * UNICODE string variations
  **********************************************************************/
@@ -248,7 +241,7 @@ typedef struct {		/* UNISTR3 - XXXX not sure about this structure */
 
 } UNISTR3;
 
-typedef struct {		/* UNIHDR + (UNISTR2*) */
+typedef struct {		/* Buffer wrapped around a UNISTR2 */
 	uint16 length;		/* number of bytes not counting NULL terminatation */
 	uint16 size;		/* number of bytes including NULL terminatation */
 	UNISTR2 *string;