sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4:kdc: Consolidate assignments to r->error_code and final_ret

Browse Source 
This makes it clearer that we are assigning a value to both together.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-06-14 11:37:03 +12:00 committed by Andrew Bartlett
parent 868e114660
commit b859b3b67d
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/kdc/hdb-samba4.c
View File

@ -800,12 +800,10 @@ static krb5_error_code hdb_samba4_audit(krb5_context context,
if (NT_STATUS_EQUAL(status, NT_STATUS_ACCOUNT_LOCKED_OUT)) {
edata_status = status;
final_ret = KRB5KDC_ERR_CLIENT_REVOKED;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KDC_ERR_CLIENT_REVOKED;
rwdc_fallback = kdc_db_ctx->rodc;
} else if (!NT_STATUS_IS_OK(status)) {
final_ret = KRB5KRB_ERR_GENERIC;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KRB_ERR_GENERIC;
rwdc_fallback = kdc_db_ctx->rodc;
} else {
if (r->error_code == KRB5KDC_ERR_NEVER_VALID) {
@ -831,8 +829,7 @@ static krb5_error_code hdb_samba4_audit(krb5_context context,
DBG_ERR("ERROR: VALIDATED_LONG_TERM_KEY "
"with error=0 => INTERNAL_ERROR\n");
status = NT_STATUS_INTERNAL_ERROR;
final_ret = KRB5KRB_ERR_GENERIC;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KRB_ERR_GENERIC;
} else if (!NT_STATUS_IS_OK(p->reject_status)) {
status = p->reject_status;
} else {
@ -849,8 +846,7 @@ static krb5_error_code hdb_samba4_audit(krb5_context context,
DBG_ERR("ERROR: PREAUTH_SUCCEEDED "
"with error=0 => INTERNAL_ERROR\n");
status = NT_STATUS_INTERNAL_ERROR;
final_ret = KRB5KRB_ERR_GENERIC;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KRB_ERR_GENERIC;
} else if (!NT_STATUS_IS_OK(p->reject_status)) {
status = p->reject_status;
} else {
@ -863,8 +859,7 @@ static krb5_error_code hdb_samba4_audit(krb5_context context,
if (NT_STATUS_EQUAL(status, NT_STATUS_ACCOUNT_LOCKED_OUT)) {
edata_status = status;
final_ret = KRB5KDC_ERR_CLIENT_REVOKED;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KDC_ERR_CLIENT_REVOKED;
} else {
status = NT_STATUS_WRONG_PASSWORD;
}
@ -890,8 +885,7 @@ static krb5_error_code hdb_samba4_audit(krb5_context context,
DBG_ERR("Unhandled hdb_auth_status=%d => INTERNAL_ERROR\n",
hdb_auth_status);
status = NT_STATUS_INTERNAL_ERROR;
final_ret = KRB5KRB_ERR_GENERIC;
r->error_code = final_ret;
r->error_code = final_ret = KRB5KRB_ERR_GENERIC;
}
if (!NT_STATUS_IS_OK(edata_status)) {