summaryrefslogtreecommitdiff
path: root/source4/libnet/libnet_join.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-07-08 08:09:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:22 -0500
commit0b92507760910872d5f0f3fe2c45f4f3af3466eb (patch)
tree51959d4c79538b6ab8c9bb4db8df9d1992437272 /source4/libnet/libnet_join.c
parentc851532bece629e114382e2c3571a18bf9b42be4 (diff)
downloadsamba-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/libnet/libnet_join.c')
-rw-r--r--source4/libnet/libnet_join.c6
1 files changed, 3 insertions, 3 deletions
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;