summaryrefslogtreecommitdiff
path: root/source3/utils/net_rpc_join.c
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-07-30 19:52:56 +0200
committerGünther Deschner <gd@samba.org>2008-07-31 13:52:33 +0200
commit9294303943c1f28df4afeef729689331d53cc242 (patch)
tree80528ee17f2ae372a93d63065c2562b5cd4885ea /source3/utils/net_rpc_join.c
parentd701d23b604dd21288e894b7d286de206eca2857 (diff)
downloadsamba-9294303943c1f28df4afeef729689331d53cc242.tar.gz
samba-9294303943c1f28df4afeef729689331d53cc242.tar.bz2
samba-9294303943c1f28df4afeef729689331d53cc242.zip
rpc_client: use init_samr_CryptPassword(Ex) in client tools.
Guenther (This used to be commit 97f7f9f21f17e8414de15953cf4eaa9959dc6f75)
Diffstat (limited to 'source3/utils/net_rpc_join.c')
-rw-r--r--source3/utils/net_rpc_join.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index f63cb14b7e..5bc38f979f 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -148,7 +148,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
/* Password stuff */
char *clear_trust_password = NULL;
- uchar pwbuf[516];
+ struct samr_CryptPassword crypt_pwd;
uchar md4_trust_password[16];
union samr_UserInfo set_info;
@@ -337,14 +337,13 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
E_md4hash(clear_trust_password, md4_trust_password);
}
- encode_pw_buffer(pwbuf, clear_trust_password, STR_UNICODE);
-
/* Set password on machine account */
- init_samr_user_info24(&set_info.info24, pwbuf, 24);
+ init_samr_CryptPassword(clear_trust_password,
+ &cli->user_session_key,
+ &crypt_pwd);
- SamOEMhashBlob(set_info.info24.password.data, 516,
- &cli->user_session_key);
+ init_samr_user_info24(&set_info.info24, crypt_pwd.data, 24);
CHECK_RPC_ERR(rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
&user_pol,