From a1d3e7b934225c69d8c1817084c477564df675ec Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 9 Jun 2011 21:08:47 +0000 Subject: [PATCH] pull up r24755 from trunk ------------------------------------------------------------------------ r24755 | ghudson | 2011-03-29 18:44:30 -0400 (Tue, 29 Mar 2011) | 11 lines ticket: 6888 target_version: 1.9.1 tags: pullup 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 version_fixed: 1.9.2 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24952 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/server/schpw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c index 0056885ef5..6fcc642872 100644 --- a/src/kadmin/server/schpw.c +++ b/src/kadmin/server/schpw.c @@ -334,15 +334,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; } -- 2.47.2