From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 8 Apr 2009 15:22:17 +0000 (+0000)
Subject: When getting initial credentials with a password, try the master if
X-Git-Tag: krb5-1.8-alpha1~559
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03f73644d9fe650bffd6b6ede1b0598689610876;p=krb5.git

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.

ticket: 6108
tags: pullup
target_version: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22182 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index ef2b7f096..f319c3540 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -144,10 +144,9 @@ krb5_get_init_creds_password(krb5_context context,
       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;