diff options
| author | Günther Deschner <gd@samba.org> | 2008-11-29 00:12:26 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-12-10 12:12:23 +0100 |
| commit | 54e3135523d8c592b76d3929c5fd127c62f7f969 (patch) | |
| tree | 474f3887f5747131623c6403ca6e67c008472020 | |
| parent | 3bd2171a21573f361b5349fde23f32954acded68 (diff) | |
| download | samba-54e3135523d8c592b76d3929c5fd127c62f7f969.tar.gz samba-54e3135523d8c592b76d3929c5fd127c62f7f969.tar.xz samba-54e3135523d8c592b76d3929c5fd127c62f7f969.zip | |
s3-libnetjoin: Fix bug #5749. Re-set acctflags while joining. fix from metze.samba-3.2.6
Guenther
(cherry picked from commit bc3a277455dd4557e796ddc0bef0f52a11f889e7)
(cherry picked from commit a6a8025d48e63a8bcb1fb03efa8ab85e415f8a38)
| -rw-r--r-- | source/libnet/libnet_join.c | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index e7525a71ac7..526a0bdfee7 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -868,10 +868,6 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, goto done; } - init_samr_CryptPasswordEx(r->in.machine_password, - &cli->user_session_key, - &crypt_pwd_ex); - /* Fill in the additional account flags now */ acct_flags |= ACB_PWNOEXP; @@ -882,23 +878,40 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, ;; } - /* Set password and account flags on machine account */ - - ZERO_STRUCT(user_info.info25); - - user_info.info25.info.fields_present = ACCT_NT_PWD_SET | - ACCT_LM_PWD_SET | - SAMR_FIELD_ACCT_FLAGS; - - user_info.info25.info.acct_flags = acct_flags; - memcpy(&user_info.info25.password.data, crypt_pwd_ex.data, - sizeof(crypt_pwd_ex.data)); + /* Set account flags on machine account */ + ZERO_STRUCT(user_info.info16); + user_info.info16.acct_flags = acct_flags; status = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx, &user_pol, - 25, + 16, &user_info); + if (!NT_STATUS_IS_OK(status)) { + + rpccli_samr_DeleteUser(pipe_hnd, mem_ctx, + &user_pol); + + libnet_join_set_error_string(mem_ctx, r, + "Failed to set account flags for machine account (%s)\n", + nt_errstr(status)); + goto done; + } + + /* Set password on machine account - first try level 26 */ + + init_samr_CryptPasswordEx(r->in.machine_password, + &cli->user_session_key, + &crypt_pwd_ex); + + init_samr_user_info26(&user_info.info26, &crypt_pwd_ex, + PASS_DONT_CHANGE_AT_NEXT_LOGON); + + status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx, + &user_pol, + 26, + &user_info); + if (NT_STATUS_EQUAL(status, NT_STATUS(DCERPC_FAULT_INVALID_TAG))) { /* retry with level 24 */ |