From e2a5f75799e7cb4432604cfc0acf9fbb91f68e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 8 Oct 2008 16:15:34 +0000 Subject: [PATCH] make any_start_seq_get try more the then first keytab when looking for keytab the first time. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23880 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/keytab_any.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/krb5/keytab_any.c b/lib/krb5/keytab_any.c index 6281f3bda..22f9c2fed 100644 --- a/lib/krb5/keytab_any.c +++ b/lib/krb5/keytab_any.c @@ -138,12 +138,16 @@ any_start_seq_get(krb5_context context, return ENOMEM; } ed = (struct any_cursor_extra_data *)c->data; - ed->a = a; - ret = krb5_kt_start_seq_get(context, ed->a->kt, &ed->cursor); - if (ret) { + for (ed->a = a; ed->a != NULL; ed->a = ed->a->next) { + ret = krb5_kt_start_seq_get(context, ed->a->kt, &ed->cursor); + if (ret == 0) + break; + } + if (ed->a == NULL) { free (c->data); c->data = NULL; - return ret; + krb5_clear_error_string (context); + return KRB5_KT_END; } return 0; }