sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-28 21:05:48 +03:00
Code

s4-samr: fix samr callers after SAMR_FIELD_PASSWORD change.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-12-04 18:18:06 +01:00
parent 7423b6a4b8
commit 4bcf8edcf8
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/libnet/libnet_passwd.c
View File

@ -360,7 +360,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_25(struct libnet_context *ctx, TA
/* prepare samr_SetUserInfo2 level 25 */ /* prepare samr_SetUserInfo2 level 25 */
ZERO_STRUCT(u_info); ZERO_STRUCT(u_info);
u_info.info25.info = *r->samr_handle.in.info21; u_info.info25.info = *r->samr_handle.in.info21;
u_info.info25.info.fields_present |= SAMR_FIELD_PASSWORD; u_info.info25.info.fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT;
encode_pw_buffer(u_info.info25.password.data, r->samr_handle.in.newpassword, STR_UNICODE); encode_pw_buffer(u_info.info25.password.data, r->samr_handle.in.newpassword, STR_UNICODE);
status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key); status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key);
@ -451,7 +451,7 @@ static NTSTATUS libnet_SetPassword_samr_handle_23(struct libnet_context *ctx, TA
/* prepare samr_SetUserInfo2 level 23 */ /* prepare samr_SetUserInfo2 level 23 */
ZERO_STRUCT(u_info); ZERO_STRUCT(u_info);
u_info.info23.info = *r->samr_handle.in.info21; u_info.info23.info = *r->samr_handle.in.info21;
u_info.info23.info.fields_present |= SAMR_FIELD_PASSWORD; u_info.info23.info.fields_present |= SAMR_FIELD_NT_PASSWORD_PRESENT;
encode_pw_buffer(u_info.info23.password.data, r->samr_handle.in.newpassword, STR_UNICODE); encode_pw_buffer(u_info.info23.password.data, r->samr_handle.in.newpassword, STR_UNICODE);
status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key); status = dcerpc_fetch_session_key(r->samr_handle.in.dcerpc_pipe, &session_key);

8
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -3511,14 +3511,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
SET_UINT (msg, info23.info.country_code, "countryCode"); SET_UINT (msg, info23.info.country_code, "countryCode");
IFSET(SAMR_FIELD_CODE_PAGE) IFSET(SAMR_FIELD_CODE_PAGE)
SET_UINT (msg, info23.info.code_page, "codePage"); SET_UINT (msg, info23.info.code_page, "codePage");
IFSET(SAMR_FIELD_PASSWORD) { IFSET(SAMR_FIELD_NT_PASSWORD_PRESENT) {
status = samr_set_password(dce_call, status = samr_set_password(dce_call,
a_state->sam_ctx, a_state->sam_ctx,
a_state->account_dn, a_state->account_dn,
a_state->domain_state->domain_dn, a_state->domain_state->domain_dn,
mem_ctx, msg, mem_ctx, msg,
&r->in.info->info23.password); &r->in.info->info23.password);
} else IFSET(SAMR_FIELD_PASSWORD2) { } else IFSET(SAMR_FIELD_LM_PASSWORD_PRESENT) {
status = samr_set_password(dce_call, status = samr_set_password(dce_call,
a_state->sam_ctx, a_state->sam_ctx,
a_state->account_dn, a_state->account_dn,
@ -3567,14 +3567,14 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL
SET_UINT (msg, info25.info.country_code, "countryCode"); SET_UINT (msg, info25.info.country_code, "countryCode");
IFSET(SAMR_FIELD_CODE_PAGE) IFSET(SAMR_FIELD_CODE_PAGE)
SET_UINT (msg, info25.info.code_page, "codePage"); SET_UINT (msg, info25.info.code_page, "codePage");
IFSET(SAMR_FIELD_PASSWORD) { IFSET(SAMR_FIELD_NT_PASSWORD_PRESENT) {
status = samr_set_password_ex(dce_call, status = samr_set_password_ex(dce_call,
a_state->sam_ctx, a_state->sam_ctx,
a_state->account_dn, a_state->account_dn,
a_state->domain_state->domain_dn, a_state->domain_state->domain_dn,
mem_ctx, msg, mem_ctx, msg,
&r->in.info->info25.password); &r->in.info->info25.password);
} else IFSET(SAMR_FIELD_PASSWORD2) { } else IFSET(SAMR_FIELD_LM_PASSWORD_PRESENT) {
status = samr_set_password_ex(dce_call, status = samr_set_password_ex(dce_call,
a_state->sam_ctx, a_state->sam_ctx,
a_state->account_dn, a_state->account_dn,

6
source4/torture/rpc/samba3rpc.c
View File

@ -580,8 +580,8 @@ static bool create_user(TALLOC_CTX *mem_ctx, struct smbcli_state *cli,
arcfour_crypt_blob(u_info.info23.password.data, 516, arcfour_crypt_blob(u_info.info23.password.data, 516,
&session_key); &session_key);
u_info.info23.info.password_expired = 0; u_info.info23.info.password_expired = 0;
u_info.info23.info.fields_present = SAMR_FIELD_PASSWORD | u_info.info23.info.fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT |
SAMR_FIELD_PASSWORD2 | SAMR_FIELD_LM_PASSWORD_PRESENT |
SAMR_FIELD_EXPIRED_FLAG; SAMR_FIELD_EXPIRED_FLAG;
sui2.in.user_handle = wks_handle; sui2.in.user_handle = wks_handle;
sui2.in.info = &u_info; sui2.in.info = &u_info;
@ -767,7 +767,7 @@ static bool join3(struct smbcli_state *cli,
cli_credentials_get_workstation(wks_creds)); cli_credentials_get_workstation(wks_creds));
i21->acct_flags = ACB_WSTRUST; i21->acct_flags = ACB_WSTRUST;
i21->fields_present = SAMR_FIELD_FULL_NAME | i21->fields_present = SAMR_FIELD_FULL_NAME |
SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_PASSWORD; SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_NT_PASSWORD_PRESENT;
/* this would break the test result expectations /* this would break the test result expectations
i21->fields_present |= SAMR_FIELD_EXPIRED_FLAG; i21->fields_present |= SAMR_FIELD_EXPIRED_FLAG;
i21->password_expired = 1; i21->password_expired = 1;

20
source4/torture/rpc/samr.c
View File

@ -2074,7 +2074,7 @@ bool test_ChangePasswordRandomBytes(struct dcerpc_pipe *p, struct torture_contex
ZERO_STRUCT(u); ZERO_STRUCT(u);
u.info25.info.fields_present = SAMR_FIELD_PASSWORD; u.info25.info.fields_present = SAMR_FIELD_NT_PASSWORD_PRESENT;
set_pw_in_buffer(u.info25.password.data, &new_random_pass); set_pw_in_buffer(u.info25.password.data, &new_random_pass);
@ -2669,9 +2669,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
* password has been changed, old and new pwdlastset * password has been changed, old and new pwdlastset
* need to be the same value */ * need to be the same value */
if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) && if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
!((pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD) || !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
(pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD2))) (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
{ {
torture_assert_int_equal(tctx, pwdlastset_old, torture_assert_int_equal(tctx, pwdlastset_old,
pwdlastset_new, "pwdlastset must be equal"); pwdlastset_new, "pwdlastset must be equal");
@ -2732,9 +2732,9 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
* password has been changed, old and new pwdlastset * password has been changed, old and new pwdlastset
* need to be the same value */ * need to be the same value */
if (!(pwd_tests[i].fields_present & SAMR_FIELD_EXPIRED_FLAG) && if (!(fields_present[f] & SAMR_FIELD_EXPIRED_FLAG) &&
!((pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD) || !((fields_present[f] & SAMR_FIELD_NT_PASSWORD_PRESENT) ||
(pwd_tests[i].fields_present & SAMR_FIELD_PASSWORD2))) (fields_present[f] & SAMR_FIELD_LM_PASSWORD_PRESENT)))
{ {
torture_assert_int_equal(tctx, pwdlastset_old, torture_assert_int_equal(tctx, pwdlastset_old,
pwdlastset_new, "pwdlastset must be equal"); pwdlastset_new, "pwdlastset must be equal");
@ -2787,9 +2787,9 @@ static bool test_user_ops(struct dcerpc_pipe *p,
int i; int i;
uint32_t rid; uint32_t rid;
const uint32_t password_fields[] = { const uint32_t password_fields[] = {
SAMR_FIELD_PASSWORD, SAMR_FIELD_NT_PASSWORD_PRESENT,
SAMR_FIELD_PASSWORD2, SAMR_FIELD_LM_PASSWORD_PRESENT,
SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2, SAMR_FIELD_NT_PASSWORD_PRESENT | SAMR_FIELD_LM_PASSWORD_PRESENT,
0 0
}; };