diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-07-08 08:09:02 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:22 -0500 |
commit | 0b92507760910872d5f0f3fe2c45f4f3af3466eb (patch) | |
tree | 51959d4c79538b6ab8c9bb4db8df9d1992437272 /source4 | |
parent | c851532bece629e114382e2c3571a18bf9b42be4 (diff) | |
download | samba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.tar.gz samba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.tar.bz2 samba-0b92507760910872d5f0f3fe2c45f4f3af3466eb.zip |
r8232: remove samr_String and netr_String as they are the same as lsa_String
metze
(This used to be commit e601042c07d7b6eed0dc34e5b136d9266b8a0f81)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/libnet/domain.c | 2 | ||||
-rw-r--r-- | source4/libnet/libnet_join.c | 6 | ||||
-rw-r--r-- | source4/libnet/libnet_passwd.c | 6 | ||||
-rw-r--r-- | source4/libnet/userman.c | 4 | ||||
-rw-r--r-- | source4/librpc/idl/lsa.idl | 24 | ||||
-rw-r--r-- | source4/librpc/idl/netlogon.idl | 178 | ||||
-rw-r--r-- | source4/librpc/idl/samr.idl | 186 | ||||
-rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 4 | ||||
-rw-r--r-- | source4/torture/libnet/domain.c | 4 | ||||
-rw-r--r-- | source4/torture/libnet/libnet_user.c | 2 | ||||
-rw-r--r-- | source4/torture/libnet/userinfo.c | 8 | ||||
-rw-r--r-- | source4/torture/libnet/userman.c | 10 | ||||
-rw-r--r-- | source4/torture/rpc/samr.c | 70 | ||||
-rw-r--r-- | source4/torture/rpc/samsync.c | 2 | ||||
-rw-r--r-- | source4/torture/rpc/schannel.c | 2 | ||||
-rw-r--r-- | source4/torture/rpc/testjoin.c | 8 |
16 files changed, 251 insertions, 265 deletions
diff --git a/source4/libnet/domain.c b/source4/libnet/domain.c index eb7a4341ec..cc5d1570f9 100644 --- a/source4/libnet/domain.c +++ b/source4/libnet/domain.c @@ -40,7 +40,7 @@ struct domain_open_state { struct samr_Connect connect; struct samr_LookupDomain lookup; struct samr_OpenDomain open; - struct samr_String domain_name; + struct lsa_String domain_name; uint32_t access_mask; struct policy_handle connect_handle; struct policy_handle domain_handle; diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index c76b16e10e..53b6db51b1 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -51,7 +51,7 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx, struct samr_Connect sc; struct policy_handle p_handle; struct samr_LookupDomain ld; - struct samr_String d_name; + struct lsa_String d_name; struct samr_OpenDomain od; struct policy_handle d_handle; struct samr_LookupNames ln; @@ -63,7 +63,7 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx, union samr_UserInfo u_info; union libnet_SetPassword r2; struct samr_GetUserPwInfo pwp; - struct samr_String samr_account_name; + struct lsa_String samr_account_name; uint32_t acct_flags; uint32_t rid, access_granted; @@ -171,7 +171,7 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx, /* prepare samr_LookupNames */ ln.in.domain_handle = &d_handle; ln.in.num_names = 1; - ln.in.names = talloc_array(mem_ctx, struct samr_String, 1); + ln.in.names = talloc_array(mem_ctx, struct lsa_String, 1); if (!ln.in.names) { r->samr.out.error_string = "Out of Memory"; return NT_STATUS_NO_MEMORY; diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index dd2fa91dec..e8412553cf 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -44,7 +44,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT struct samr_OemChangePasswordUser2 oe2; struct samr_ChangePasswordUser2 pw2; struct samr_ChangePasswordUser3 pw3; - struct samr_String server, account; + struct lsa_String server, account; struct samr_AsciiName a_server, a_account; struct samr_CryptPassword nt_pass, lm_pass; struct samr_Password nt_verifier, lm_verifier; @@ -506,7 +506,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * struct samr_Connect sc; struct policy_handle p_handle; struct samr_LookupDomain ld; - struct samr_String d_name; + struct lsa_String d_name; struct samr_OpenDomain od; struct policy_handle d_handle; struct samr_LookupNames ln; @@ -578,7 +578,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * /* prepare samr_LookupNames */ ln.in.domain_handle = &d_handle; ln.in.num_names = 1; - ln.in.names = talloc_array(mem_ctx, struct samr_String, 1); + ln.in.names = talloc_array(mem_ctx, struct lsa_String, 1); if (!ln.in.names) { r->samr.out.error_string = "Out of Memory"; return NT_STATUS_NO_MEMORY; diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c index 8d2cc0de02..28c328e258 100644 --- a/source4/libnet/userman.c +++ b/source4/libnet/userman.c @@ -127,7 +127,7 @@ struct composite_context *libnet_rpc_useradd_send(struct dcerpc_pipe *p, /* preparing parameters to send rpc request */ s->createuser.in.domain_handle = &io->in.domain_handle; - s->createuser.in.account_name = talloc_zero(c, struct samr_String); + s->createuser.in.account_name = talloc_zero(c, struct lsa_String); s->createuser.in.account_name->string = talloc_strdup(c, io->in.username); s->createuser.out.user_handle = &s->user_handle; s->createuser.out.rid = &s->user_rid; @@ -349,7 +349,7 @@ struct composite_context *libnet_rpc_userdel_send(struct dcerpc_pipe *p, /* preparing parameters to send rpc request */ s->lookupname.in.domain_handle = &io->in.domain_handle; s->lookupname.in.num_names = 1; - s->lookupname.in.names = talloc_zero(s, struct samr_String); + s->lookupname.in.names = talloc_zero(s, struct lsa_String); s->lookupname.in.names->string = io->in.username; /* send the request */ 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 ); diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 66f327b6f9..700070fb1b 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -1219,7 +1219,7 @@ static NTSTATUS samr_LookupRids(struct dcesrv_call_state *dce_call, TALLOC_CTX * struct samr_domain_state *d_state; int i, total; NTSTATUS status = NT_STATUS_OK; - struct samr_String *names; + struct lsa_String *names; uint32_t *ids; ZERO_STRUCT(r->out.names); @@ -1232,7 +1232,7 @@ static NTSTATUS samr_LookupRids(struct dcesrv_call_state *dce_call, TALLOC_CTX * if (r->in.num_rids == 0) return NT_STATUS_OK; - names = talloc_array(mem_ctx, struct samr_String, r->in.num_rids); + names = talloc_array(mem_ctx, struct lsa_String, r->in.num_rids); ids = talloc_array(mem_ctx, uint32_t, r->in.num_rids); if ((names == NULL) || (ids == NULL)) diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c index e36a21d2c6..7edbd5742d 100644 --- a/source4/torture/libnet/domain.c +++ b/source4/torture/libnet/domain.c @@ -25,7 +25,7 @@ #include "libcli/composite/monitor.h" static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct samr_String *domname, + struct lsa_String *domname, struct policy_handle *domain_handle) { NTSTATUS status; @@ -77,7 +77,7 @@ BOOL torture_domainopen(void) TALLOC_CTX *mem_ctx; BOOL ret = True; struct policy_handle h; - struct samr_String name; + struct lsa_String name; mem_ctx = talloc_init("test_domain_open"); binding = lp_parm_string(-1, "torture", "binding"); diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c index 38cc81926f..4db0028481 100644 --- a/source4/torture/libnet/libnet_user.c +++ b/source4/torture/libnet/libnet_user.c @@ -38,7 +38,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_OpenUser r2; struct samr_DeleteUser r3; struct samr_Close r4; - struct samr_String names[2]; + struct lsa_String names[2]; uint32_t rid; struct policy_handle user_handle; diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c index 6dad86178f..2dd60b02f1 100644 --- a/source4/torture/libnet/userinfo.c +++ b/source4/torture/libnet/userinfo.c @@ -27,7 +27,7 @@ #define TEST_USERNAME "libnetuserinfotest" static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct policy_handle *handle, struct samr_String *domname, + struct policy_handle *handle, struct lsa_String *domname, struct dom_sid2 *sid) { NTSTATUS status; @@ -86,7 +86,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_LookupNames r1; struct samr_OpenUser r2; struct samr_DeleteUser r3; - struct samr_String names[2]; + struct lsa_String names[2]; uint32_t rid; struct policy_handle user_handle; @@ -138,7 +138,7 @@ static BOOL test_create(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *name, uint32_t *rid) { NTSTATUS status; - struct samr_String username; + struct lsa_String username; struct samr_CreateUser r; struct policy_handle user_handle; @@ -263,7 +263,7 @@ BOOL torture_userinfo(void) TALLOC_CTX *mem_ctx; BOOL ret = True; struct policy_handle h; - struct samr_String name; + struct lsa_String name; struct dom_sid2 sid; uint32_t rid; diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c index f688336fd2..a5049691ed 100644 --- a/source4/torture/libnet/userman.c +++ b/source4/torture/libnet/userman.c @@ -28,7 +28,7 @@ static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct policy_handle *handle, struct samr_String *domname) + struct policy_handle *handle, struct lsa_String *domname) { NTSTATUS status; struct policy_handle h, domain_handle; @@ -147,7 +147,7 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_LookupNames r1; struct samr_OpenUser r2; struct samr_DeleteUser r3; - struct samr_String names[2]; + struct lsa_String names[2]; uint32_t rid; struct policy_handle user_handle; @@ -200,7 +200,7 @@ static BOOL test_createuser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, { NTSTATUS status; struct policy_handle user_handle; - struct samr_String username; + struct lsa_String username; struct samr_CreateUser r1; struct samr_Close r2; uint32_t user_rid; @@ -277,7 +277,7 @@ BOOL torture_useradd(void) const char *binding; struct dcerpc_pipe *p; struct policy_handle h; - struct samr_String domain_name; + struct lsa_String domain_name; const char *name = TEST_USERNAME; TALLOC_CTX *mem_ctx; BOOL ret = True; @@ -338,7 +338,7 @@ BOOL torture_userdel(void) const char *binding; struct dcerpc_pipe *p; struct policy_handle h; - struct samr_String domain_name; + struct lsa_String domain_name; const char *name = TEST_USERNAME; TALLOC_CTX *mem_ctx; BOOL ret = True; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 93b8471f99..4ec7e867c0 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -41,7 +41,7 @@ static BOOL test_QueryUserInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, static BOOL test_QueryAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle); -static void init_samr_String(struct samr_String *string, const char *s) +static void init_lsa_String(struct lsa_String *string, const char *s) { string->string = s; } @@ -93,7 +93,7 @@ static BOOL test_SetDsrmPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, { NTSTATUS status; struct samr_SetDsrmPassword r; - struct samr_String string; + struct lsa_String string; struct samr_Password hash; if (!lp_parm_bool(-1, "torture", "dangerous", False)) { @@ -103,7 +103,7 @@ static BOOL test_SetDsrmPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, E_md4hash("TeSTDSRM123", hash.hash); - init_samr_String(&string, "Administrator"); + init_lsa_String(&string, "Administrator"); r.in.name = &string; r.in.unknown = 0; @@ -226,10 +226,10 @@ static BOOL test_SetUserInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, ZERO_STRUCT(u.info21); \ u.info21.fields_present = fpval; \ } \ - init_samr_String(&u.info ## lvl1.field1, value); \ + init_lsa_String(&u.info ## lvl1.field1, value); \ TESTCALL(SetUserInfo, s) \ TESTCALL(SetUserInfo2, s2) \ - init_samr_String(&u.info ## lvl1.field1, ""); \ + init_lsa_String(&u.info ## lvl1.field1, ""); \ TESTCALL(QueryUserInfo, q); \ u = *q.out.info; \ STRING_EQUAL(u.info ## lvl1.field1.string, value, field1); \ @@ -650,8 +650,8 @@ static BOOL test_SetAliasInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, r.in.level = levels[i]; r.in.info = talloc(mem_ctx, union samr_AliasInfo); switch (r.in.level) { - case 2 : init_samr_String(&r.in.info->name,TEST_ALIASNAME); break; - case 3 : init_samr_String(&r.in.info->description, + case 2 : init_lsa_String(&r.in.info->name,TEST_ALIASNAME); break; + case 3 : init_lsa_String(&r.in.info->description, "Test Description, should test I18N as well"); break; } @@ -698,7 +698,7 @@ static BOOL test_GetGroupsForUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, } static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct samr_String *domain_name) + struct lsa_String *domain_name) { NTSTATUS status; struct samr_GetDomPwInfo r; @@ -770,9 +770,9 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, { NTSTATUS status; struct samr_LookupNames n; - struct samr_String sname[2]; + struct lsa_String sname[2]; - init_samr_String(&sname[0], name); + init_lsa_String(&sname[0], name); n.in.domain_handle = domain_handle; n.in.num_names = 1; @@ -784,7 +784,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, return status; } - init_samr_String(&sname[1], "xxNONAMExx"); + init_lsa_String(&sname[1], "xxNONAMExx"); n.in.num_names = 2; status = dcerpc_samr_LookupNames(p, mem_ctx, &n); if (!NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED)) { @@ -792,7 +792,7 @@ static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, return status; } - init_samr_String(&sname[1], "xxNONAMExx"); + init_lsa_String(&sname[1], "xxNONAMExx"); n.in.num_names = 0; status = dcerpc_samr_LookupNames(p, mem_ctx, &n); if (!NT_STATUS_IS_OK(status)) { @@ -975,7 +975,7 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c struct samr_GetDomPwInfo dom_pw_info; int policy_min_pw_len = 0; - struct samr_String domain_name; + struct lsa_String domain_name; domain_name.string = ""; dom_pw_info.in.domain_name = &domain_name; @@ -1021,7 +1021,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, NTSTATUS status; struct samr_ChangePasswordUser2 r; BOOL ret = True; - struct samr_String server, account; + struct lsa_String server, account; struct samr_CryptPassword nt_pass, lm_pass; struct samr_Password nt_verifier, lm_verifier; char *oldpass = *password; @@ -1032,7 +1032,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GetDomPwInfo dom_pw_info; int policy_min_pw_len = 0; - struct samr_String domain_name; + struct lsa_String domain_name; domain_name.string = ""; dom_pw_info.in.domain_name = &domain_name; @@ -1046,7 +1046,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, newpass = samr_rand_pass(mem_ctx, policy_min_pw_len); server.string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p)); - init_samr_String(&account, TEST_ACCOUNT_NAME); + init_lsa_String(&account, TEST_ACCOUNT_NAME); E_md4hash(oldpass, old_nt_hash); E_md4hash(newpass, new_nt_hash); @@ -1090,7 +1090,7 @@ static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, NTSTATUS status; struct samr_ChangePasswordUser3 r; BOOL ret = True; - struct samr_String server, account; + struct lsa_String server, account; struct samr_CryptPassword nt_pass, lm_pass; struct samr_Password nt_verifier, lm_verifier; char *oldpass = *password; @@ -1101,7 +1101,7 @@ static BOOL test_ChangePasswordUser3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, printf("Testing ChangePasswordUser3\n"); server.string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p)); - init_samr_String(&account, TEST_ACCOUNT_NAME); + init_lsa_String(&account, TEST_ACCOUNT_NAME); E_md4hash(oldpass, old_nt_hash); E_md4hash(newpass, new_nt_hash); @@ -1484,11 +1484,11 @@ static BOOL test_CreateAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, { NTSTATUS status; struct samr_CreateDomAlias r; - struct samr_String name; + struct lsa_String name; uint32_t rid; BOOL ret = True; - init_samr_String(&name, TEST_ALIASNAME); + init_lsa_String(&name, TEST_ALIASNAME); r.in.domain_handle = domain_handle; r.in.alias_name = &name; r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; @@ -1578,11 +1578,11 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, /* This call creates a 'normal' account - check that it really does */ const uint32_t acct_flags = ACB_NORMAL; - struct samr_String name; + struct lsa_String name; BOOL ret = True; user_ctx = talloc_named(mem_ctx, 0, "test_CreateUser2 per-user context"); - init_samr_String(&name, TEST_ACCOUNT_NAME); + init_lsa_String(&name, TEST_ACCOUNT_NAME); r.in.domain_handle = domain_handle; r.in.account_name = &name; @@ -1705,7 +1705,7 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DeleteUser d; struct policy_handle user_handle; uint32_t rid; - struct samr_String name; + struct lsa_String name; BOOL ret = True; int i; @@ -1737,7 +1737,7 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t acct_flags = account_types[i].acct_flags; uint32_t access_granted; user_ctx = talloc_named(mem_ctx, 0, "test_CreateUser2 per-user context"); - init_samr_String(&name, account_types[i].account_name); + init_lsa_String(&name, account_types[i].account_name); r.in.domain_handle = handle; r.in.account_name = &name; @@ -1919,12 +1919,12 @@ static BOOL test_SetGroupInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, the name is still reserved, so creating the old name fails, but deleting by the old name also fails */ if (s.in.level == 2) { - init_samr_String(&s.in.info->string, "NewName"); + init_lsa_String(&s.in.info->string, "NewName"); } #endif if (s.in.level == 4) { - init_samr_String(&s.in.info->description, "test description"); + init_lsa_String(&s.in.info->description, "test description"); } status = dcerpc_samr_SetGroupInfo(p, mem_ctx, &s); @@ -2172,7 +2172,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, printf("Testing LookupNames\n"); n.in.domain_handle = handle; n.in.num_names = r.out.sam->count; - n.in.names = talloc_array(mem_ctx, struct samr_String, r.out.sam->count); + n.in.names = talloc_array(mem_ctx, struct lsa_String, r.out.sam->count); for (i=0;i<r.out.sam->count;i++) { n.in.names[i] = r.out.sam->entries[i].name; } @@ -2328,7 +2328,7 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m r.in.domain_handle = handle; r.in.level = levels[i]; - init_samr_String(&r.in.name, TEST_ACCOUNT_NAME); + init_lsa_String(&r.in.name, TEST_ACCOUNT_NAME); status = dcerpc_samr_GetDisplayEnumerationIndex(p, mem_ctx, &r); @@ -2340,7 +2340,7 @@ static BOOL test_GetDisplayEnumerationIndex(struct dcerpc_pipe *p, TALLOC_CTX *m ret = False; } - init_samr_String(&r.in.name, "zzzzzzzz"); + init_lsa_String(&r.in.name, "zzzzzzzz"); status = dcerpc_samr_GetDisplayEnumerationIndex(p, mem_ctx, &r); @@ -2369,7 +2369,7 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX * r.in.domain_handle = handle; r.in.level = levels[i]; - init_samr_String(&r.in.name, TEST_ACCOUNT_NAME); + init_lsa_String(&r.in.name, TEST_ACCOUNT_NAME); status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r); if (ok_lvl[i] && @@ -2380,7 +2380,7 @@ static BOOL test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX * ret = False; } - init_samr_String(&r.in.name, "zzzzzzzz"); + init_lsa_String(&r.in.name, "zzzzzzzz"); status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r); if (ok_lvl[i] && !NT_STATUS_EQUAL(NT_STATUS_NO_MORE_ENTRIES, status)) { @@ -2881,10 +2881,10 @@ static BOOL test_CreateDomainGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, NTSTATUS status; struct samr_CreateDomainGroup r; uint32_t rid; - struct samr_String name; + struct lsa_String name; BOOL ret = True; - init_samr_String(&name, TEST_GROUPNAME); + init_lsa_String(&name, TEST_GROUPNAME); r.in.domain_handle = domain_handle; r.in.name = &name; @@ -3033,11 +3033,11 @@ static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, } static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct policy_handle *handle, struct samr_String *domain) + struct policy_handle *handle, struct lsa_String *domain) { NTSTATUS status; struct samr_LookupDomain r; - struct samr_String n2; + struct lsa_String n2; BOOL ret = True; printf("Testing LookupDomain(%s)\n", domain->string); diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 29e66ec4c3..911f0fe471 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -136,7 +136,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx, const char *domain, struct dom_sid **sid) { - struct samr_String name; + struct lsa_String name; struct samr_OpenDomain o; struct samr_LookupDomain l; struct policy_handle *domain_handle = talloc(mem_ctx, struct policy_handle); diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index e87f950b62..164da6ceef 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -35,7 +35,7 @@ static BOOL test_samr_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) NTSTATUS status; struct samr_GetDomPwInfo r; int i; - struct samr_String name; + struct lsa_String name; name.string = lp_workgroup(); r.in.domain_name = &name; diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 270d8ff7b7..c46d99f7b8 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -44,7 +44,7 @@ static NTSTATUS DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle user_handle; uint32_t rid; struct samr_LookupNames n; - struct samr_String sname; + struct lsa_String sname; struct samr_OpenUser r; sname.string = name; @@ -105,9 +105,9 @@ struct test_join *torture_create_testuser(const char *username, uint32_t access_granted; uint32_t rid; DATA_BLOB session_key; - struct samr_String name; - struct samr_String comment; - struct samr_String full_name; + struct lsa_String name; + struct lsa_String comment; + struct lsa_String full_name; int policy_min_pw_len = 0; struct test_join *join; |