diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-03-29 22:44:30 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-03-29 22:44:30 +0000 |
| commit | 6f94401ee3b0bfb1d7262fccbd794108fac3aa92 (patch) | |
| tree | ab591df32998537eced9ce0d56eb2ccf36424fad | |
| parent | 772766f5f7d1e3b37f3fc380fb20ea143955ae07 (diff) | |
| download | krb5-6f94401ee3b0bfb1d7262fccbd794108fac3aa92.tar.gz krb5-6f94401ee3b0bfb1d7262fccbd794108fac3aa92.tar.xz krb5-6f94401ee3b0bfb1d7262fccbd794108fac3aa92.zip | |
In r21175 (on the mskrb branch, merged in r21690) the result codes for
password quality and other errors were accidentally reversed. Fix
them so that password quality errors generate a "soft" failure and
other errors generate a "hard" failure, as Heimdal and Microsoft do.
Also recognize KADM5_PASS_Q_GENERIC (added in 1.9) as a password
quality error.
ticket: 6888
target_version: 1.9.1
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24755 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kadmin/server/schpw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c index 802584e75f..d12c5075b1 100644 --- a/src/kadmin/server/schpw.c +++ b/src/kadmin/server/schpw.c @@ -330,15 +330,16 @@ process_chpw_request(context, server_handle, realm, keytab, case KADM5_PASS_REUSE: case KADM5_PASS_Q_CLASS: case KADM5_PASS_Q_DICT: + case KADM5_PASS_Q_GENERIC: case KADM5_PASS_TOOSOON: - numresult = KRB5_KPASSWD_HARDERROR; + numresult = KRB5_KPASSWD_SOFTERROR; break; case 0: numresult = KRB5_KPASSWD_SUCCESS; strlcpy(strresult, "", sizeof(strresult)); break; default: - numresult = KRB5_KPASSWD_SOFTERROR; + numresult = KRB5_KPASSWD_HARDERROR; break; } |