svn rev #24952: branches/krb5-1-9/src/kadmin/server/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24952
Commit By: tlyu
Log Message:
ticket: 6888
version_fixed: 1.9.2
status: resolved

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.


Changed Files:
U   branches/krb5-1-9/src/kadmin/server/schpw.c
Modified: branches/krb5-1-9/src/kadmin/server/schpw.c
===================================================================
--- branches/krb5-1-9/src/kadmin/server/schpw.c	2011-06-09 21:08:43 UTC (rev 24951)
+++ branches/krb5-1-9/src/kadmin/server/schpw.c	2011-06-09 21:08:47 UTC (rev 24952)
@@ -334,15 +334,16 @@
     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;
     }