From: Sam Hartman Date: Mon, 28 Oct 2002 21:05:48 +0000 (+0000) Subject: If we get cannot resolve KDC for master but find a slave X-Git-Tag: krb5-1.3-alpha1~310 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27122f489d518a79017765d27e1de3f9dd8edc5a;p=krb5.git 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 4665b6525..0a8e44035 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2002-10-28 Sam Hartman + + * 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 * 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 d9ca6a402..f49fb8aa6 100644 --- 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;