r8232: remove samr_String and netr_String as they are the same as lsa_String

metze
(This used to be commit e601042c07d7b6eed0dc34e5b136d9266b8a0f81)

1 files changed, 86 insertions, 92 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index f73dc24f47..bd06912b29 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -12,19 +12,13 @@
   endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
   pointer_default_top(unique),
-  depends(lsa,samr)
+  depends(lsa,samr,security)
 ]
 
 interface netlogon
 {
 	declare bitmap samr_AcctFlags;
 
-	typedef [public] struct {
-		[value(strlen_m(string)*2)]  uint16 size;
-		[value(strlen_m(string)*2)]  uint16 length;
-		unistr_noterm *string;
-	} netr_String;
-	
 	/*****************/
 	/* Function 0x00 */
 
@@ -92,12 +86,12 @@ interface netlogon
 	} netr_AcctLockStr;
 
 	typedef struct {
-		netr_String domain_name;
+		lsa_String  domain_name;
 		uint32      parameter_control;
 		uint32      logon_id_low;
 		uint32      logon_id_high;
-		netr_String account_name;
-		netr_String workstation;
+		lsa_String  account_name;
+		lsa_String  workstation;
 	} netr_IdentityInfo;
 
 	typedef struct {
@@ -151,12 +145,12 @@ interface netlogon
 		NTTIME last_password_change;
 		NTTIME allow_password_change;
 		NTTIME force_password_change;
-		netr_String account_name;
-		netr_String full_name;
-		netr_String logon_script;
-		netr_String profile_path;
-		netr_String home_directory;
-		netr_String home_drive;
+		lsa_String account_name;
+		lsa_String full_name;
+		lsa_String logon_script;
+		lsa_String profile_path;
+		lsa_String home_directory;
+		lsa_String home_drive;
 		uint16 logon_count;
 		uint16 bad_password_count;
 		uint32 rid;
@@ -164,8 +158,8 @@ interface netlogon
 		samr_RidWithAttributeArray groups;
 		uint32 user_flags;
 		netr_UserSessionKey key;
-		netr_String logon_server;
-		netr_String domain;
+		lsa_String logon_server;
+		lsa_String domain;
 		dom_sid2 *domain_sid;
 		netr_LMSessionKey LMSessKey;
 		samr_AcctFlags acct_flags;
@@ -191,25 +185,25 @@ interface netlogon
 		netr_SamBaseInfo base;
 		uint32 sidcount;
 		[size_is(sidcount)] netr_SidAttr *sids;
-		netr_String forest;
-		netr_String principle;
+		lsa_String forest;
+		lsa_String principle;
 		uint32 unknown4[20];
 	} netr_SamInfo6;
 
 	typedef struct {
 		uint32 pac_size;
 		[size_is(pac_size)] uint8 *pac;
-		netr_String logon_domain;
-		netr_String logon_server;
-		netr_String principal_name;
+		lsa_String logon_domain;
+		lsa_String logon_server;
+		lsa_String principal_name;
 		uint32 auth_size;
 		[size_is(auth_size)] uint8 *auth;
 		netr_UserSessionKey user_session_key;
 		uint32 expansionroom[10];
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 	} netr_PacInfo;
 
 	typedef [switch_type(uint16)] union {
@@ -306,10 +300,10 @@ interface netlogon
 
 	typedef struct {
 		unistr *account_name;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -358,15 +352,15 @@ interface netlogon
 	} netr_USER_PRIVATE_INFO;
 
 	typedef struct {
-		netr_String account_name;
-		netr_String full_name;
+		lsa_String account_name;
+		lsa_String full_name;
 		uint32 rid;
 		uint32 primary_gid;
-		netr_String home_directory;
-		netr_String home_drive;
-		netr_String logon_script;
-		netr_String description;
-		netr_String workstations;
+		lsa_String home_directory;
+		lsa_String home_drive;
+		lsa_String logon_script;
+		lsa_String description;
+		lsa_String workstations;
 		NTTIME last_logon;
 		NTTIME last_logoff;
 		samr_LogonHours logon_hours;
@@ -380,17 +374,17 @@ interface netlogon
 		bool8 nt_password_present;
 		bool8 lm_password_present;
 		bool8 password_expired;
-		netr_String comment;
-		netr_String parameters;
+		lsa_String comment;
+		lsa_String parameters;
 		uint16 country_code;
 		uint16 code_page;
 		netr_USER_PRIVATE_INFO user_private_info;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String profile_path;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String profile_path;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -398,8 +392,8 @@ interface netlogon
 	} netr_DELTA_USER;
 
 	typedef struct {
-		netr_String domain_name;
-		netr_String comment;
+		lsa_String domain_name;
+		lsa_String comment;
 		NTTIME force_logoff_time;
 		uint16 min_password_length;
 		uint16 password_history_length;
@@ -411,9 +405,9 @@ interface netlogon
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
 		netr_AcctLockStr account_lockout;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 logon_to_chgpass;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -421,16 +415,16 @@ interface netlogon
 	} netr_DELTA_DOMAIN;
 
 	typedef struct {
-		netr_String group_name;
+		lsa_String group_name;
 		uint32 rid;
 		uint32 attributes;
-		netr_String description;
+		lsa_String description;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -438,12 +432,12 @@ interface netlogon
 	} netr_DELTA_GROUP;
 
 	typedef struct {
-		netr_String OldName;
-		netr_String NewName;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String OldName;
+		lsa_String NewName;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -461,14 +455,14 @@ interface netlogon
 	} netr_DELTA_GROUP_MEMBER;
 
 	typedef struct {
-		netr_String alias_name;
+		lsa_String alias_name;
 		uint32 rid;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String description;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String description;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -498,17 +492,17 @@ interface netlogon
 		bool8 auditingmode;
 		uint32 maxauditeventcount;
 		[size_is(maxauditeventcount+1)] uint32 *eventauditoptions;
-		netr_String primary_domain_name;
+		lsa_String primary_domain_name;
 		dom_sid2 *sid;
 		netr_QUOTA_LIMITS quota_limits;
 		udlong sequence_num;
 		NTTIME db_create_time;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -516,15 +510,15 @@ interface netlogon
 	} netr_DELTA_POLICY;
 
 	typedef struct {
-		netr_String domain_name;
+		lsa_String domain_name;
 		uint32 num_controllers;
-		[size_is(num_controllers)] netr_String *controller_names;
+		[size_is(num_controllers)] lsa_String *controller_names;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 posix_offset;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -539,15 +533,15 @@ interface netlogon
 		uint32 privilege_entries;
 		uint32 privilege_control;
 		[size_is(privilege_entries)] uint32 *privilege_attrib;
-		[size_is(privilege_entries)] netr_String *privilege_name;
+		[size_is(privilege_entries)] lsa_String *privilege_name;
 		netr_QUOTA_LIMITS quotalimits;
 		uint32 system_flags;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -575,10 +569,10 @@ interface netlogon
 		NTTIME old_cipher_set_time;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
-		netr_String unknown1;
-		netr_String unknown2;
-		netr_String unknown3;
-		netr_String unknown4;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
+		lsa_String unknown4;
 		uint32 unknown5;
 		uint32 unknown6;
 		uint32 unknown7;
@@ -968,9 +962,9 @@ interface netlogon
 		unistr *unknown3;
 		unistr *unknown4;
 		netr_BinaryString blob2;
-		netr_String product;
-		netr_String unknown5;
-		netr_String unknown6;
+		lsa_String product;
+		lsa_String unknown5;
+		lsa_String unknown6;
 		uint32 unknown7[4];
 	} netr_DomainQuery1;
 
@@ -980,9 +974,9 @@ interface netlogon
 	} netr_DomainQuery;
 
 	typedef struct {
-		netr_String domainname;
-		netr_String fulldomainname;
-		netr_String forest;
+		lsa_String domainname;
+		lsa_String fulldomainname;
+		lsa_String forest;
 		GUID        guid;
 		dom_sid2    *sid;
 		netr_BinaryString unknown1[4];