adding group member code, made a start. found that the group members'

rid is needed not the name (see DOMAIN_GRP_MEMBER) decided to go home.
(This used to be commit 9337049dfc98becfa74522d418dae64a97c7a304)

1 files changed, 40 insertions, 15 deletions

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index f8e95937a1..4c42c18921 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -749,19 +749,26 @@ typedef struct samr_group_info4
 
 } GROUP_INFO4;
 
-/* SAMR_R_QUERY_GROUPINFO - SAM Group Info */
-typedef struct r_samr_query_groupinfo_info
+/* GROUP_INFO_CTR */
+typedef struct group_info_ctr
 {
-	uint32 ptr;        
-	uint16 switch_value;     /* 0x0001 seen */
-	/* uint8[2] padding */
+	uint16 switch_value;
 
 	union
  	{
+		GROUP_INFO4 info4;
 		GROUP_INFO1 info1;
 
 	} group;
 
+} GROUP_INFO_CTR;
+
+/* SAMR_R_QUERY_GROUPINFO - SAM Group Info */
+typedef struct r_samr_query_groupinfo_info
+{
+	uint32 ptr;        
+	GROUP_INFO_CTR *ctr;
+
 	uint32 status;
 
 } SAMR_R_QUERY_GROUPINFO;
@@ -771,14 +778,7 @@ typedef struct r_samr_query_groupinfo_info
 typedef struct q_samr_set_group_info
 {
 	POLICY_HND pol;        /* policy handle */
-	uint16 switch_value1;     /* 0x0004 seen */
-	uint16 switch_value2;     /* 0x0004 seen */
-
-	union
- 	{
-		GROUP_INFO4 info4;
-
-	} group;
+	GROUP_INFO_CTR *ctr;
 
 } SAMR_Q_SET_GROUPINFO;
 
@@ -1005,8 +1005,6 @@ typedef struct r_samr_lookup_names_info
 	uint32 num_entries2; 
 	DOM_RID3 dom_rid[MAX_LOOKUP_SIDS]; /* domain RIDs being looked up */
 
-	uint32 num_entries3; 
-
 	uint32 status; /* return code */
 
 } SAMR_R_LOOKUP_NAMES;
@@ -1106,6 +1104,33 @@ typedef struct r_samr_unknown_32_info
 
 } SAMR_R_UNKNOWN_32;
 
+/* SAMR_Q_QUERY_GROUPMEM - query group members */
+typedef struct q_samr_query_groupmem_info
+{
+	POLICY_HND group_pol;        /* policy handle */
+
+} SAMR_Q_QUERY_GROUPMEM;
+
+
+/* SAMR_R_QUERY_GROUPMEM - query group members */
+typedef struct r_samr_query_groupmem_info
+{
+	uint32 ptr;
+	uint32 num_entries;
+
+	uint32 ptr_rids;
+	uint32 ptr_attrs;
+
+	uint32 num_rids;
+	uint32 *rid;
+
+	uint32 num_attrs;
+	uint32 *attr;
+
+	uint32 status;
+
+} SAMR_R_QUERY_GROUPMEM;
+
 
 /* SAMR_Q_ADD_GROUPMEM - probably an add group member */
 typedef struct q_samr_add_group_mem_info