sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-10 13:57:47 +03:00
Code

r15597: more ads join fixes -- we can only set the PWDNOEXP and DES_ONLY acb flags on the setuserinfo(), not the createuser info call

Browse Source
This commit is contained in:
Gerald Carter 2006-05-14 12:58:52 +00:00 committed by Gerald (Jerry) Carter
parent 8059d0ae39
commit d933ac273d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/utils/net_ads.c
View File

@ -917,7 +917,7 @@ static NTSTATUS join_create_machine( TALLOC_CTX *mem_ctx, struct cli_state *cli,
uint32 user_rid;
uint32 num_rids, *name_types, *user_rids;
uint32 flags = 0x3e8;
uint32 acb_info = ACB_WSTRUST | ACB_PWNOEXP;
uint32 acb_info = ACB_WSTRUST;
uchar pwbuf[516];
SAM_USERINFO_CTR ctr;
SAM_USER_INFO_24 p24;
@ -949,9 +949,7 @@ static NTSTATUS join_create_machine( TALLOC_CTX *mem_ctx, struct cli_state *cli,
strlower_m(acct_name);
const_acct_name = acct_name;
#ifndef ENCTYPE_ARCFOUR_HMAC
acb_info |= ACB_USE_DES_KEY_ONLY;
#endif
/* Don't try to set any acb_info flags other than ACB_WSTRUST */
status = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
acct_name, acb_info, 0xe005000b, &user_pol, &user_rid);
@ -1026,10 +1024,14 @@ static NTSTATUS join_create_machine( TALLOC_CTX *mem_ctx, struct cli_state *cli,
ctr.switch_value = 16;
ctr.info.id16 = &p16;
init_sam_user_info16(&p16, acb_info);
/* Fill in the additional account flags now */
/* Ignoring the return value is necessary for joining a domain
as a normal user with "Add workstation to domain" privilege. */
acb_info |= ACB_PWNOEXP;
#ifndef ENCTYPE_ARCFOUR_HMAC
acb_info |= ACB_USE_DES_KEY_ONLY;
#endif
init_sam_user_info16(&p16, acb_info);
status = rpccli_samr_set_userinfo2(pipe_hnd, mem_ctx, &user_pol, 16,
&cli->user_session_key, &ctr);