If we get cannot resolve KDC for master but find a slave

return the real error from the slave rather than the resolution error.

ticket: 1232

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4665b65252f5a68c36e1c6294b5e6e90c8feff3d..0a8e44035e154375dc784702c5fb348f80a5b5f7 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-28  Sam Hartman  <hartmans@mit.edu>
+
+       * gic_keytab.c (krb5_get_init_creds_keytab): Don't allow failure
+       to  resolve master KDC to mask error from a slave we did talk to. 
+
 2002-10-24  Ken Hornstein  <kenh@cmf.nrl.navy.mil>
 
        * gic_pwd.c (krb5_get_init_creds_password): Exit out of the loop

diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c
index d9ca6a40208c134553416897292646fdec513057..f49fb8aa6e30c837b8081fd9af9b613bfb9e61a6 100644 (file)
--- a/src/lib/krb5/krb/gic_keytab.c
+++ b/src/lib/krb5/krb/gic_keytab.c
@@ -100,7 +100,7 @@ krb5_get_init_creds_keytab(krb5_context context, krb5_creds *creds, krb5_princip
       /* if the master is unreachable, return the error from the
         slave we were able to contact */
 
-      if ((ret2 == KRB5_KDC_UNREACH) || (ret == KRB5_REALM_CANT_RESOLVE))
+      if ((ret2 == KRB5_KDC_UNREACH) || (ret2 == KRB5_REALM_CANT_RESOLVE))
         goto cleanup;
 
       ret = ret2;