diff options
| author | Günther Deschner <gd@samba.org> | 2008-02-12 00:51:51 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-02-12 18:53:59 +0100 |
| commit | bc742a06a2e7ce494446ab3a752fd45d08c25659 (patch) | |
| tree | 72d709ae05c33c2dece2a9e681649ed5e6275440 /source3/utils/net_rpc_join.c | |
| parent | 6f2a384b33f33a4340e7bd4d1b1be4ab70f0c2c8 (diff) | |
| download | samba-bc742a06a2e7ce494446ab3a752fd45d08c25659.tar.gz samba-bc742a06a2e7ce494446ab3a752fd45d08c25659.tar.bz2 samba-bc742a06a2e7ce494446ab3a752fd45d08c25659.zip | |
Remove all callers of rpccli_samr_setuserinfo2 and replace with
rpccli_samr_SetUserInfo (see the opcode mixup in rpc_samr.h).
Guenther
(This used to be commit bdc49185036060ebb9c727767dce52e4b01bd8b4)
Diffstat (limited to 'source3/utils/net_rpc_join.c')
| -rw-r--r-- | source3/utils/net_rpc_join.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 0e9e603e23..f94e08edef 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -154,8 +154,8 @@ int net_rpc_join_newstyle(int argc, const char **argv) uchar pwbuf[516]; SAM_USERINFO_CTR ctr; SAM_USER_INFO_24 p24; - SAM_USER_INFO_16 p16; uchar md4_trust_password[16]; + union samr_UserInfo set_info; /* Misc */ @@ -365,17 +365,15 @@ int net_rpc_join_newstyle(int argc, const char **argv) seems to cope with either value so don't bomb out if the set userinfo2 level 0x10 fails. -tpot */ - ZERO_STRUCT(ctr); - ctr.switch_value = 16; - ctr.info.id16 = &p16; - - init_sam_user_info16(&p16, acb_info); + set_info.info16.acct_flags = acb_info; /* Ignoring the return value is necessary for joining a domain as a normal user with "Add workstation to domain" privilege. */ - result = rpccli_samr_set_userinfo2(pipe_hnd, mem_ctx, &user_pol, 16, - &cli->user_session_key, &ctr); + result = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx, + &user_pol, + 16, + &set_info); rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol); cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */ |