diff options
| author | Sam Hartman <hartmans@mit.edu> | 2002-10-28 21:05:48 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2002-10-28 21:05:48 +0000 |
| commit | 27122f489d518a79017765d27e1de3f9dd8edc5a (patch) | |
| tree | 6166db6e9b2ebe766807ecc1853275ff3e1949c3 /src/lib | |
| parent | a440f29da8a078c940fd226f29dc3f5f8d061cc0 (diff) | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gic_keytab.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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; |