diff options
| author | Jeremy Allison <jra@samba.org> | 2005-07-19 00:59:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:09 -0500 |
| commit | 84651aca04cbcbf50ab2e78333cc9d9e49dd92f5 (patch) | |
| tree | 9b376be4333f3e1cbd67a2b7bfacd61e11985609 /source/utils/net_rpc_join.c | |
| parent | 7ff7211b808e708c00a3b0f57be8d1af3c632bd7 (diff) | |
| download | samba-84651aca04cbcbf50ab2e78333cc9d9e49dd92f5.tar.gz | |
r8564: Sometimes we're too dumb to live... Fix samr calls where we were
using USER_INFO_XX structs and functions where XX was sometimes
in hex and sometimes in decimal. Now it's all in decimal (should
be no functionality change).
Jeremy.
Diffstat (limited to 'source/utils/net_rpc_join.c')
| -rw-r--r-- | source/utils/net_rpc_join.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c index 6888076a147..8d19ad888fc 100644 --- a/source/utils/net_rpc_join.c +++ b/source/utils/net_rpc_join.c @@ -117,7 +117,7 @@ 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_10 p10; + SAM_USER_INFO_16 p16; uchar md4_trust_password[16]; /* Misc */ @@ -287,15 +287,15 @@ int net_rpc_join_newstyle(int argc, const char **argv) userinfo2 level 0x10 fails. -tpot */ ZERO_STRUCT(ctr); - ctr.switch_value = 0x10; - ctr.info.id10 = &p10; + ctr.switch_value = 16; + ctr.info.id16 = &p16; - init_sam_user_info10(&p10, acb_info); + init_sam_user_info16(&p16, acb_info); /* Ignoring the return value is necessary for joining a domain as a normal user with "Add workstation to domain" privilege. */ - result = cli_samr_set_userinfo2(cli, mem_ctx, &user_pol, 0x10, + result = cli_samr_set_userinfo2(cli, mem_ctx, &user_pol, 16, &cli->user_session_key, &ctr); /* Now check the whole process from top-to-bottom */ |