Changeset 228 for branches/samba-3.2.x/source/utils/net_rpc_join.c

Timestamp:

May 26, 2009, 9:44:50 AM (17 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/utils/net_rpc_join.c (modified) (2 diffs)

branches/samba-3.2.x/source/utils/net_rpc_join.c

@@ -147 +147 @@
 
         char *clear_trust_password = NULL;
-        uchar pwbuf[516];
+        ;
         uchar md4_trust_password[16];
         union samr_UserInfo set_info;
@@ -334 +334 @@
         }
 
-        encode_pw_buffer(pwbuf, clear_trust_password, STR_UNICODE);
-
         /* Set password on machine account */
 
-        init_samr_user_info24(&set_info.info24, pwbuf, 24);
-
-        SamOEMhashBlob(set_info.info24.password.data, 516,
-                       &cli->user_session_key);
+        init_samr_CryptPassword(clear_trust_password,
+                                &cli->user_session_key,
+                                &crypt_pwd);
+
+        init_samr_user_info24(&set_info.info24, &crypt_pwd,
+                              PASS_DONT_CHANGE_AT_NEXT_LOGON);
 
         CHECK_RPC_ERR(rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,