pullup from trunk

ticket: 2974
version_fixed: 1.4.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17134 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index ba5562ed1bee01683668aa65eee2009724a97861..5578c519b4c566c87d64d20372ac46580d575c87 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-22  Tom Yu  <tlyu@mit.edu>
+
+       * gic_keytab.c (krb5_get_init_creds_keytab): When calling
+       krb5_get_init_creds() for the second time (with use_master=1),
+       also accept KRB5_REALM_UNKNOWN as a soft error, and use the result
+       from the first call to krb5_get_init_creds().  This can happen
+       when no master KDC is configured.
+
 2005-02-09  Tom Yu  <tlyu@mit.edu>
 
        * gic_pwd.c (krb5_get_init_creds_password): Fix so empty password

diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c
index a3cd443b1d2df9031ee5938e7abd6679196567ef..ba704e6be8e29f7e1c4ca8ee3007a8a129a7df56 100644 (file)
--- a/src/lib/krb5/krb/gic_keytab.c
+++ b/src/lib/krb5/krb/gic_keytab.c
@@ -127,7 +127,9 @@ 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) || (ret2 == KRB5_REALM_CANT_RESOLVE))
+      if ((ret2 == KRB5_KDC_UNREACH) ||
+         (ret2 == KRB5_REALM_CANT_RESOLVE) ||
+         (ret2 == KRB5_REALM_UNKNOWN))
         goto cleanup;
 
       ret = ret2;