oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

kadm5: Use KADM5_PASS_Q_GENERIC

Browse Source
This commit is contained in:
Nicolas Williams
2021-12-15 15:45:56 -06:00
committed by Luke Howard
parent 437d4e95ec
commit 4aa8677081
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kdc/httpkadmind.c
View File

@@ -224,6 +224,7 @@ audit_trail(kadmin_request_desc r, krb5_error_code ret)
CASE(KADM5_PASS_Q_TOOSHORT);
CASE(KADM5_PASS_Q_CLASS);
CASE(KADM5_PASS_Q_DICT);
CASE(KADM5_PASS_Q_GENERIC);
CASE(KADM5_PASS_REUSE);
CASE(KADM5_PASS_TOOSOON);
CASE(KADM5_POLICY_REF);

8
kpasswd/kpasswdd.c
View File

@@ -398,11 +398,15 @@ change (krb5_auth_context auth_context,
if (ret) {
const char *str = krb5_get_error_message(context, ret);
if (ret == KADM5_PASS_Q_DICT) {
switch (ret) {
case KADM5_PASS_Q_TOOSHORT:
case KADM5_PASS_Q_CLASS:
case KADM5_PASS_Q_DICT:
case KADM5_PASS_Q_GENERIC:
krb5_warnx(context,
"%s didn't pass password quality check with error: %s",
client, str);
} else {
default:
krb5_warnx(context, "kadm5_s_chpass_principal_cond: %s", str);
}
reply_priv (auth_context, s, sa, sa_size, KRB5_KPASSWD_SOFTERROR,

4
lib/kadm5/chpass_s.c
View File

@@ -131,8 +131,8 @@ change(void *server_handle,
pwd_reason = kadm5_check_password_quality(context->context,
princ, &pwd_data);
if (pwd_reason != NULL) {
krb5_set_error_message(context->context, KADM5_PASS_Q_DICT, "%s", pwd_reason);
return KADM5_PASS_Q_DICT;
krb5_set_error_message(context->context, KADM5_PASS_Q_GENERIC, "%s", pwd_reason);
return KADM5_PASS_Q_GENERIC;
}
}