From a20d1b04063ee8d17f0fdc89ea41562c3224eec3 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 22 Mar 2005 23:28:26 +0000 Subject: [PATCH] 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 --- src/lib/krb5/krb/ChangeLog | 8 ++++++++ src/lib/krb5/krb/gic_keytab.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index ba5562ed1..5578c519b 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,11 @@ +2005-03-22 Tom Yu + + * 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 * 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 a3cd443b1..ba704e6be 100644 --- 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; -- 2.26.2