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

metze
(This used to be commit e601042c07d7b6eed0dc34e5b136d9266b8a0f81)

3 files changed, 187 insertions, 201 deletions

diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 82f5684721..3939826693 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -13,6 +13,23 @@
   depends(security)
 ] interface lsarpc
 {
+	typedef [public] struct {
+		[value(2*strlen_m(string))] uint16 length;
+		[value(2*strlen_m(string))] uint16 size;
+		unistr_noterm *string;
+	} lsa_String;
+
+	typedef [public] struct {
+		uint32 count;
+		[size_is(count)] lsa_String *names;
+	} lsa_Strings;
+
+	typedef [public] struct {
+		[value(strlen_m(string))] uint16 length;
+		[value(strlen_m(string))] uint16 size;
+		ascstr_noterm *string;
+	} lsa_AsciiString;
+
 	/******************/
 	/* Function: 0x00 */
 	NTSTATUS lsa_Close (
@@ -29,13 +46,6 @@
 
 	/******************/
 	/* Function: 0x02 */
-
-	typedef struct {
-		[value(2*strlen_m(string))] uint16 length;
-		[value(2*strlen_m(string))] uint16 size;
-		unistr_noterm *string;
-	} lsa_String;
-
 	typedef struct {
 		uint32 low;
 		uint32 high;
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];
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index a989d09486..0d3e49ff36 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -77,15 +77,9 @@
 
 	/******************/
 	/* Function: 0x05 */
-	typedef struct {
-		[value(2*strlen_m(string))] uint16 length;
-		[value(2*strlen_m(string))] uint16 size;
-		unistr_noterm *string;
-	} samr_String;	
-
 	NTSTATUS samr_LookupDomain (
 		[in,ref]  policy_handle *connect_handle,		
-		[in,ref]  samr_String *domain_name,
+		[in,ref]  lsa_String *domain_name,
 		[out]     dom_sid2 *sid
 		);
 
@@ -95,7 +89,7 @@
 
 	typedef struct {
 		uint32 idx;
-		samr_String name;
+		lsa_String name;
 	} samr_SamEntry;
 
 	typedef struct {
@@ -142,9 +136,9 @@
 
 	typedef struct {
 		NTTIME force_logoff_time;
-		samr_String comment;
-		samr_String domain_name;
-		samr_String primary; /* PDC name if this is a BDC */
+		lsa_String comment;
+		lsa_String domain_name;
+		lsa_String primary; /* PDC name if this is a BDC */
 		udlong sequence_num;
 		uint32 unknown2;
 		samr_Role role;
@@ -159,15 +153,15 @@
 	} samr_DomInfo3;
 
 	typedef struct {
-		samr_String comment;
+		lsa_String comment;
 	} samr_DomInfo4;
 
 	typedef struct {
-		samr_String domain_name;
+		lsa_String domain_name;
 	} samr_DomInfo5;
 
 	typedef struct {
-		samr_String primary;
+		lsa_String primary;
 	} samr_DomInfo6;
 
 	typedef struct {
@@ -241,7 +235,7 @@
 	/* Function    0x0a     */
 	NTSTATUS samr_CreateDomainGroup(
 		[in,ref]      policy_handle *domain_handle,
-		[in,ref]      samr_String *name,
+		[in,ref]      lsa_String *name,
 		[in]          uint32 access_mask,
 		[out,ref]     policy_handle *group_handle,
 		[out,ref]     uint32 *rid
@@ -262,7 +256,7 @@
 	/* Function    0x0c     */
 	NTSTATUS samr_CreateUser(
 		[in,ref]      policy_handle *domain_handle,
-		[in,ref]      samr_String *account_name,
+		[in,ref]      lsa_String *account_name,
 		[in]          uint32 access_mask,
 		[out,ref]     policy_handle *user_handle,
 		[out,ref]     uint32 *rid
@@ -290,7 +284,7 @@
 	/* Function    0x0e     */
 	NTSTATUS samr_CreateDomAlias(
 		[in,ref]      policy_handle *domain_handle,
-		[in,ref]      samr_String   *alias_name,
+		[in,ref]      lsa_String   *alias_name,
 		[in]          uint32         access_mask,
 		[out,ref]     policy_handle *alias_handle,
 		[out,ref]     uint32        *rid
@@ -326,7 +320,7 @@
 	NTSTATUS samr_LookupNames(
 		[in,ref]      policy_handle *domain_handle,
 		[in,range(0,1000)] uint32 num_names,
-		[in,size_is(1000),length_is(num_names)] samr_String names[],
+		[in,size_is(1000),length_is(num_names)] lsa_String names[],
 		[out]         samr_Ids rids,
 		[out]         samr_Ids types
 		);
@@ -334,17 +328,11 @@
 
 	/************************/
 	/* Function    0x12     */
-
-	typedef struct {
-		uint32 count;
-		[size_is(count)] samr_String *names;
-	} samr_Strings;
-
 	NTSTATUS samr_LookupRids(
 		[in,ref]      policy_handle *domain_handle,
 		[in,range(0,1000)] uint32 num_rids,
 		[in,size_is(1000),length_is(num_rids)] uint32 rids[],
-		[out]         samr_Strings names,
+		[out]         lsa_Strings names,
 		[out]         samr_Ids types
 		);
 
@@ -366,10 +354,10 @@
 	/* Function    0x14     */
 
 	typedef struct {
-		samr_String name;
+		lsa_String name;
 		uint32 attributes;
 		uint32 num_members;
-		samr_String description;
+		lsa_String description;
 	} samr_GroupInfoAll;
 
 	typedef struct {
@@ -377,7 +365,7 @@
 	} samr_GroupInfoX;
 
 	typedef struct {
-		samr_String description;
+		lsa_String description;
 	} samr_GroupInfoDesciption;
 
 	typedef enum {
@@ -390,9 +378,9 @@
 
 	typedef [switch_type(samr_GroupInfoEnum)] union {
 		[case(GROUPINFOALL)]         samr_GroupInfoAll    all;
-		[case(GROUPINFONAME)]        samr_String            name;
+		[case(GROUPINFONAME)]        lsa_String           name;
 		[case(GROUPINFOX)]           samr_GroupInfoX      unknown;
-		[case(GROUPINFODESCRIPTION)] samr_String            description;
+		[case(GROUPINFODESCRIPTION)] lsa_String           description;
 		[case(GROUPINFOALL2)]        samr_GroupInfoAll    all2;
 	} samr_GroupInfo;
 
@@ -476,9 +464,9 @@
 	/* Function    0x1c     */
 
 	typedef struct {
-		samr_String name;
+		lsa_String name;
 		uint32 num_members;
-		samr_String description;
+		lsa_String description;
 	} samr_AliasInfoAll;
 
 	typedef enum {
@@ -489,8 +477,8 @@
 
 	typedef [switch_type(samr_AliasInfoEnum)] union {
 		[case(ALIASINFOALL)] samr_AliasInfoAll all;
-		[case(ALIASINFONAME)] samr_String name;
-		[case(ALIASINFODESCRIPTION)] samr_String description;
+		[case(ALIASINFONAME)] lsa_String name;
+		[case(ALIASINFODESCRIPTION)] lsa_String description;
 	} samr_AliasInfo;
 
 	NTSTATUS samr_QueryAliasInfo(
@@ -552,16 +540,16 @@
 	/************************/
 	/* Function    0x24     */
 	typedef struct {
-		samr_String account_name;
-		samr_String full_name;
+		lsa_String account_name;
+		lsa_String full_name;
 		uint32 primary_gid;
-		samr_String description;
-		samr_String comment;
+		lsa_String description;
+		lsa_String comment;
 	} samr_UserInfo1;
 
 	typedef struct {
-		samr_String comment;
-		samr_String unknown; /* settable, but doesn't stick. probably obsolete */
+		lsa_String comment;
+		lsa_String unknown; /* settable, but doesn't stick. probably obsolete */
 		uint16 country_code;
 		uint16 code_page;
 	} samr_UserInfo2;
@@ -573,15 +561,15 @@
 	} samr_LogonHours;
 
 	typedef struct {
-		samr_String account_name;
-		samr_String full_name;
+		lsa_String account_name;
+		lsa_String full_name;
 		uint32 rid;
 		uint32 primary_gid;
-		samr_String home_directory;
-		samr_String home_drive;
-		samr_String logon_script;
-		samr_String profile_path;
-		samr_String workstations;
+		lsa_String home_directory;
+		lsa_String home_drive;
+		lsa_String logon_script;
+		lsa_String profile_path;
+		lsa_String workstations;
 		NTTIME last_logon;
 		NTTIME last_logoff;
 		NTTIME last_password_change;
@@ -598,16 +586,16 @@
 	} samr_UserInfo4;
 
 	typedef struct {
-		samr_String account_name;
-		samr_String full_name;
+		lsa_String account_name;
+		lsa_String full_name;
 		uint32 rid;
 		uint32 primary_gid;
-		samr_String home_directory;
-		samr_String home_drive;
-		samr_String logon_script;
-		samr_String profile_path;
-		samr_String description;
-		samr_String workstations;
+		lsa_String home_directory;
+		lsa_String home_drive;
+		lsa_String logon_script;
+		lsa_String profile_path;
+		lsa_String description;
+		lsa_String workstations;
 		NTTIME last_logon;
 		NTTIME last_logoff;
 		samr_LogonHours logon_hours;
@@ -619,16 +607,16 @@
 	} samr_UserInfo5;
 
 	typedef struct {
-		samr_String account_name;
-		samr_String full_name;
+		lsa_String account_name;
+		lsa_String full_name;
 	} samr_UserInfo6;
 
 	typedef struct {
-		samr_String account_name;
+		lsa_String account_name;
 	} samr_UserInfo7;
 
 	typedef struct {
-		samr_String full_name;
+		lsa_String full_name;
 	} samr_UserInfo8;
 
 	typedef struct {
@@ -636,24 +624,24 @@
 	} samr_UserInfo9;
 
 	typedef struct {
-		samr_String home_directory;
-		samr_String home_drive;
+		lsa_String home_directory;
+		lsa_String home_drive;
 	} samr_UserInfo10;
 
 	typedef struct {
-		samr_String logon_script;
+		lsa_String logon_script;
 	} samr_UserInfo11;
 
 	typedef struct {
-		samr_String profile_path;
+		lsa_String profile_path;
 	} samr_UserInfo12;
 
 	typedef struct {
-		samr_String description;
+		lsa_String description;
 	} samr_UserInfo13;
 
 	typedef struct {
-		samr_String workstations;
+		lsa_String workstations;
 	} samr_UserInfo14;
 
 	typedef struct {
@@ -665,7 +653,7 @@
 	} samr_UserInfo17;
 
 	typedef struct {
-		samr_String parameters;
+		lsa_String parameters;
 	} samr_UserInfo20;
 
 	/* this defines the bits used for fields_present in info21 */
@@ -693,19 +681,19 @@
 		NTTIME acct_expiry;
 		NTTIME allow_password_change;
 		NTTIME force_password_change;
-		samr_String account_name;
-		samr_String full_name;
-		samr_String home_directory;
-		samr_String home_drive;
-		samr_String logon_script;
-		samr_String profile_path;
-		samr_String description;
-		samr_String workstations;
-		samr_String comment;
-		samr_String parameters;
-		samr_String unknown1;
-		samr_String unknown2;
-		samr_String unknown3;
+		lsa_String account_name;
+		lsa_String full_name;
+		lsa_String home_directory;
+		lsa_String home_drive;
+		lsa_String logon_script;
+		lsa_String profile_path;
+		lsa_String description;
+		lsa_String workstations;
+		lsa_String comment;
+		lsa_String parameters;
+		lsa_String unknown1;
+		lsa_String unknown2;
+		lsa_String unknown3;
 		uint32 buf_count;
 		[size_is(buf_count)] uint8 *buffer;
 		uint32 rid;
@@ -840,9 +828,9 @@
 		uint32    idx;
 		uint32    rid;
 		samr_AcctFlags acct_flags;
-		samr_String account_name;
-		samr_String full_name;
-		samr_String description;
+		lsa_String account_name;
+		lsa_String full_name;
+		lsa_String description;
 	} samr_DispEntryGeneral;
 
 	typedef struct {
@@ -854,8 +842,8 @@
 		uint32    idx;
 		uint32    rid;
 		samr_AcctFlags acct_flags;
-		samr_String account_name;
-		samr_String description;
+		lsa_String account_name;
+		lsa_String description;
 	} samr_DispEntryFull;
 
 	typedef struct {
@@ -864,14 +852,8 @@
 	} samr_DispInfoFull;
 
 	typedef struct {
-		[value(strlen_m(string))] uint16 length;
-		[value(strlen_m(string))] uint16 size;
-		ascstr_noterm *string;
-	} samr_AsciiName;	
-
-	typedef struct {
 		uint32    idx;
-		samr_AsciiName account_name;
+		lsa_AsciiString account_name;
 	} samr_DispEntryAscii;
 
 	typedef struct {
@@ -914,7 +896,7 @@
 	NTSTATUS samr_GetDisplayEnumerationIndex(
 		[in,ref]    policy_handle *domain_handle,
 		[in]        uint16 level,
-		[in]        samr_String name,
+		[in]        lsa_String name,
 		[out]       uint32 idx
 		);
 
@@ -1019,7 +1001,7 @@
 	NTSTATUS samr_GetDisplayEnumerationIndex2(
 		[in,ref]    policy_handle *domain_handle,
 		[in]        uint16 level,
-		[in]        samr_String name,
+		[in]        lsa_String name,
 		[out]       uint32 idx
 		);
 
@@ -1028,7 +1010,7 @@
 	/* Function    0x32     */
 	NTSTATUS samr_CreateUser2(
 		[in,ref]      policy_handle *domain_handle,
-		[in,ref]      samr_String *account_name,
+		[in,ref]      lsa_String *account_name,
 		[in]          samr_AcctFlags acct_flags,
 		[in]          uint32 access_mask,
 		[out,ref]     policy_handle *user_handle,
@@ -1072,8 +1054,8 @@
 	/* Function    0x36     */
 
 	NTSTATUS samr_OemChangePasswordUser2(
-		[in]              samr_AsciiName *server,
-		[in,ref]          samr_AsciiName *account,
+		[in]              lsa_AsciiString *server,
+		[in,ref]          lsa_AsciiString *account,
 		[in]              samr_CryptPassword *password,
 		[in]              samr_Password *hash
 		);
@@ -1081,8 +1063,8 @@
 	/************************/
 	/* Function    0x37     */
 	NTSTATUS samr_ChangePasswordUser2(
-		[in]              samr_String *server,
-		[in,ref]          samr_String *account,
+		[in]              lsa_String *server,
+		[in,ref]          lsa_String *account,
 		[in]              samr_CryptPassword *nt_password,
 		[in]              samr_Password *nt_verifier,
 		[in]              bool8 lm_change,
@@ -1093,7 +1075,7 @@
 	/************************/
 	/* Function    0x38     */
 	NTSTATUS samr_GetDomPwInfo(
-		[in]        samr_String *domain_name,
+		[in]        lsa_String *domain_name,
 		[out]       samr_PwInfo info
 		);
 
@@ -1170,8 +1152,8 @@
 	} samr_ChangeReject;
 
 	NTSTATUS samr_ChangePasswordUser3(
-		[in]              samr_String *server,
-		[in,ref]          samr_String *account,
+		[in]              lsa_String *server,
+		[in,ref]          lsa_String *account,
 		[in]              samr_CryptPassword *nt_password,
 		[in]              samr_Password *nt_verifier,
 		[in]              bool8 lm_change,
@@ -1221,7 +1203,7 @@
 	*/
 
 	NTSTATUS samr_SetDsrmPassword(
-		[in]       samr_String *name,
+		[in]       lsa_String *name,
 		[in]       uint32 unknown,
 		[in]       samr_Password *hash
 		);