summaryrefslogtreecommitdiff
path: root/source4/libnet
diff options
context:
space:
mode:
Diffstat (limited to 'source4/libnet')
-rw-r--r--source4/libnet/domain.c2
-rw-r--r--source4/libnet/libnet_join.c6
-rw-r--r--source4/libnet/libnet_passwd.c6
-rw-r--r--source4/libnet/userman.c4
4 files changed, 9 insertions, 9 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 */