sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r13479: Return the joined domain SID and user SID as structures, not strings.

Browse Source 
Andrew Bartlett
(This used to be commit e1de45bce4)
This commit is contained in:
Andrew Bartlett 2006-02-13 00:02:31 +00:00 committed by Gerald (Jerry) Carter
parent e7630ebe47
commit 358122c688
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/torture/nbt/dgram.c
View File

@ -250,7 +250,7 @@ static BOOL nbt_test_ntlogon(TALLOC_CTX *mem_ctx,
struct socket_address *dest;
struct test_join *join_ctx;
struct cli_credentials *machine_credentials;
const char *dom_sid;
const struct dom_sid *dom_sid;
const char *myaddress = talloc_strdup(dgmsock, iface_best_ip(address));
struct nbt_ntlogon_packet logon;
@ -305,7 +305,7 @@ static BOOL nbt_test_ntlogon(TALLOC_CTX *mem_ctx,
logon.req.logon.user_name = TEST_NAME"$";
logon.req.logon.mailslot_name = dgmslot->mailslot_name;
logon.req.logon.acct_control = ACB_WSTRUST;
logon.req.logon.sid = *dom_sid_parse_talloc(dgmslot, dom_sid);
logon.req.logon.sid = *dom_sid;
logon.req.logon.nt_version = 1;
logon.req.logon.lmnt_token = 0xFFFF;
logon.req.logon.lm20_token = 0xFFFF;

18
source4/torture/rpc/testjoin.c
View File

@ -40,7 +40,8 @@ struct test_join {
struct dcerpc_pipe *p;
struct policy_handle user_handle;
struct libnet_JoinDomain *libnet_r;
const char *dom_sid;
struct dom_sid *dom_sid;
struct dom_sid *user_sid;
};
@ -161,7 +162,8 @@ struct test_join *torture_create_testuser(const char *username,
goto failed;
}
join->dom_sid = dom_sid_string(join, l.out.sid);
talloc_steal(join, l.out.sid);
join->dom_sid = l.out.sid;
o.in.connect_handle = &handle;
o.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
@ -200,6 +202,8 @@ again:
goto failed;
}
join->user_sid = dom_sid_add_rid(join, join->dom_sid, rid);
pwp.in.user_handle = &join->user_handle;
status = dcerpc_samr_GetUserPwInfo(join->p, join, &pwp);
@ -330,7 +334,8 @@ struct test_join *torture_join_domain(const char *machine_name,
}
tj->p = libnet_r->out.samr_pipe;
tj->user_handle = *libnet_r->out.user_handle;
tj->dom_sid = dom_sid_string(tj, libnet_r->out.domain_sid);
tj->dom_sid = libnet_r->out.domain_sid;
talloc_steal(tj, libnet_r->out.domain_sid);
ZERO_STRUCT(u);
s.in.user_handle = &tj->user_handle;
@ -354,11 +359,6 @@ struct test_join *torture_join_domain(const char *machine_name,
printf("SetUserInfo (non-critical) failed - %s\n", nt_errstr(status));
}
DEBUG(0, ("%s joined domain %s (%s).\n",
libnet_r->in.netbios_name,
libnet_r->out.domain_name,
tj->dom_sid));
*machine_credentials = cli_credentials_init(tj);
cli_credentials_set_conf(*machine_credentials);
cli_credentials_set_workstation(*machine_credentials, machine_name, CRED_SPECIFIED);
@ -489,7 +489,7 @@ void torture_leave_domain(struct test_join *join)
/*
return the dom sid for a test join
*/
const char *torture_join_sid(struct test_join *join)
const struct dom_sid *torture_join_sid(struct test_join *join)
{
return join->dom_sid;
}