mirror of
https://github.com/samba-team/samba.git
synced 2025-02-24 13:57:43 +03:00
r25823: remove unneeded nesting by using error and out logic
metze (This used to be commit 86db839382a6cf92e659abb9e8e51ef828e1e422)
This commit is contained in:
parent
7fdf565604
commit
1e14ad7cfe
@ -73,7 +73,12 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
|
|||||||
user->user_private_info.DataLength = data.length;
|
user->user_private_info.DataLength = data.length;
|
||||||
|
|
||||||
nt_status = ndr_pull_struct_blob(&data, mem_ctx, &keys, (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
|
nt_status = ndr_pull_struct_blob(&data, mem_ctx, &keys, (ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
|
||||||
if (NT_STATUS_IS_OK(nt_status)) {
|
if (!NT_STATUS_IS_OK(nt_status)) {
|
||||||
|
*error_string = talloc_asprintf(mem_ctx, "Failed to parse Sensitive Data for %s:", username);
|
||||||
|
dump_data(10, data.data, data.length);
|
||||||
|
return nt_status;
|
||||||
|
}
|
||||||
|
|
||||||
if (keys.keys.keys2.lmpassword.length == 16) {
|
if (keys.keys.keys2.lmpassword.length == 16) {
|
||||||
if (rid_crypt) {
|
if (rid_crypt) {
|
||||||
sam_rid_crypt(rid, keys.keys.keys2.lmpassword.pwd.hash, lm_hash.hash, 0);
|
sam_rid_crypt(rid, keys.keys.keys2.lmpassword.pwd.hash, lm_hash.hash, 0);
|
||||||
@ -93,11 +98,6 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
|
|||||||
user->nt_password_present = true;
|
user->nt_password_present = true;
|
||||||
}
|
}
|
||||||
/* TODO: rid decrypt history fields */
|
/* TODO: rid decrypt history fields */
|
||||||
} else {
|
|
||||||
*error_string = talloc_asprintf(mem_ctx, "Failed to parse Sensitive Data for %s:", username);
|
|
||||||
dump_data(10, data.data, data.length);
|
|
||||||
return nt_status;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return NT_STATUS_OK;
|
return NT_STATUS_OK;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user