svn rev #22252: branches/krb5-1-7/src/lib/krb5/krb/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22252
Commit By: tlyu
Log Message:
ticket: 6108
version_fixed: 1.7

pull up r22182 from trunk

 ------------------------------------------------------------------------
 r22182 | ghudson | 2009-04-08 11:22:17 -0400 (Wed, 08 Apr 2009) | 9 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/gic_pwd.c

 ticket: 6108
 tags: pullup
 target_version: 1.7

 When getting initial credentials with a password, try the master if
 preauth fails on a slave, since preauth can fail due to an out-of-date
 key.  This removes a snippet added in r14939 which was considering
 only hardware preauth.


Changed Files:
U   branches/krb5-1-7/src/lib/krb5/krb/gic_pwd.c
Modified: branches/krb5-1-7/src/lib/krb5/krb/gic_pwd.c
===================================================================
--- branches/krb5-1-7/src/lib/krb5/krb/gic_pwd.c	2009-04-15 20:07:37 UTC (rev 22251)
+++ branches/krb5-1-7/src/lib/krb5/krb/gic_pwd.c	2009-04-15 20:07:40 UTC (rev 22252)
@@ -144,10 +144,9 @@
       goto cleanup;
 
    /* If all the kdc's are unavailable, or if the error was due to a
-      user interrupt, or preauth errored out, fail */
+      user interrupt, fail */
 
    if ((ret == KRB5_KDC_UNREACH) ||
-       (ret == KRB5_PREAUTH_FAILED) ||
        (ret == KRB5_LIBOS_PWDINTR) ||
 	   (ret == KRB5_REALM_CANT_RESOLVE))
       goto cleanup;