1 files changed, 0 insertions, 188 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 5919bc7910..086f61e8c6 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -590,194 +590,6 @@ typedef struct r_samr_enum_dom_aliases_info
 } SAMR_R_ENUM_DOM_ALIASES;
 
 
-/* -- Level 1 Display Info - User Information -- */
-
-typedef struct samr_entry_info1
-{
-	uint32 user_idx;
-
-	uint32 rid_user;
-	uint32 acb_info;
-
-	UNIHDR hdr_acct_name;
-	UNIHDR hdr_user_name;
-	UNIHDR hdr_user_desc;
-
-} SAM_ENTRY1;
-
-typedef struct samr_str_entry_info1
-{
-	UNISTR2 uni_acct_name;
-	UNISTR2 uni_full_name;
-	UNISTR2 uni_acct_desc;
-
-} SAM_STR1;
-
-typedef struct sam_entry_info_1
-{
-	SAM_ENTRY1 *sam;
-	SAM_STR1   *str;
-
-} SAM_DISPINFO_1;
-
-
-/* -- Level 2 Display Info - Trust Account Information -- */
-
-typedef struct samr_entry_info2
-{
-	uint32 user_idx;
-
-	uint32 rid_user;
-	uint32 acb_info;
-
-	UNIHDR hdr_srv_name;
-	UNIHDR hdr_srv_desc;
-
-} SAM_ENTRY2;
-
-typedef struct samr_str_entry_info2
-{
-	UNISTR2 uni_srv_name;
-	UNISTR2 uni_srv_desc;
-
-} SAM_STR2;
-
-typedef struct sam_entry_info_2
-{
-	SAM_ENTRY2 *sam;
-	SAM_STR2   *str;
-
-} SAM_DISPINFO_2;
-
-
-/* -- Level 3 Display Info - Domain Group Information -- */
-
-typedef struct samr_entry_info3
-{
-	uint32 grp_idx;
-
-	uint32 rid_grp;
-	uint32 attr;     /* SE_GROUP_xxx, usually 7 */
-
-	UNIHDR hdr_grp_name;
-	UNIHDR hdr_grp_desc;
-
-} SAM_ENTRY3;
-
-typedef struct samr_str_entry_info3
-{
-	UNISTR2 uni_grp_name;
-	UNISTR2 uni_grp_desc;
-
-} SAM_STR3;
-
-typedef struct sam_entry_info_3
-{
-	SAM_ENTRY3 *sam;
-	SAM_STR3   *str;
-
-} SAM_DISPINFO_3;
-
-
-/* -- Level 4 Display Info - User List (ASCII) -- */
-
-typedef struct samr_entry_info4
-{
-	uint32 user_idx;
-	STRHDR hdr_acct_name;
-
-} SAM_ENTRY4;
-
-typedef struct samr_str_entry_info4
-{
-	STRING2 acct_name;
-
-} SAM_STR4;
-
-typedef struct sam_entry_info_4
-{
-	SAM_ENTRY4 *sam;
-	SAM_STR4   *str;
-
-} SAM_DISPINFO_4;
-
-
-/* -- Level 5 Display Info - Group List (ASCII) -- */
-
-typedef struct samr_entry_info5
-{
-	uint32 grp_idx;
-	STRHDR hdr_grp_name;
-
-} SAM_ENTRY5;
-
-typedef struct samr_str_entry_info5
-{
-	STRING2 grp_name;
-
-} SAM_STR5;
-
-typedef struct sam_entry_info_5
-{
-	SAM_ENTRY5 *sam;
-	SAM_STR5   *str;
-
-} SAM_DISPINFO_5;
-
-
-typedef struct sam_dispinfo_ctr_info
-{
-	union
-	{
-		SAM_DISPINFO_1 *info1; /* users/names/descriptions */
-		SAM_DISPINFO_2 *info2; /* trust accounts */
-		SAM_DISPINFO_3 *info3; /* domain groups/descriptions */
-		SAM_DISPINFO_4 *info4; /* user list (ASCII) - used by Win95 */
-		SAM_DISPINFO_5 *info5; /* group list (ASCII) */
-		void       *info; /* allows assignment without typecasting, */
-
-	} sam;
-
-} SAM_DISPINFO_CTR;
-
-
-/* SAMR_Q_QUERY_DISPINFO - SAM rids, names and descriptions */
-typedef struct q_samr_query_disp_info
-{
-	POLICY_HND domain_pol;
-
-	uint16 switch_level;    /* see SAM_DISPINFO_CTR above */
-	/* align */
-
-	uint32 start_idx;       /* start enumeration index */
-	uint32 max_entries;     /* maximum number of entries to return */
-	uint32 max_size;        /* recommended data size; if exceeded server
-				   should return STATUS_MORE_ENTRIES */
-
-} SAMR_Q_QUERY_DISPINFO;
-
-
-/* SAMR_R_QUERY_DISPINFO  */
-typedef struct r_samr_query_dispinfo_info
-{
-	uint32 total_size;     /* total data size for all matching entries
-				  (0 = uncalculated) */
-	uint32 data_size;      /* actual data size returned = size of SAM_ENTRY
-				  structures + total length of strings */
-
-	uint16 switch_level;   /* see SAM_DISPINFO_CTR above */
-	/* align */
-
-	uint32 num_entries;    /* number of entries returned */
-	uint32 ptr_entries;
-	uint32 num_entries2;
-
-	SAM_DISPINFO_CTR *ctr;
-
-	NTSTATUS status;
-
-} SAMR_R_QUERY_DISPINFO;
-
 /* SAMR_Q_GET_DISPENUM_INDEX */
 typedef struct q_samr_get_dispenum_index
 {