From c6d0dea6be14e58bd7c86355f1a1436183a04aef Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Thu, 25 Nov 2010 11:21:05 -0800 Subject: [PATCH] remove dup prototype, fix the ok_as_delegate protocol --- lib/krb5/get_cred.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c index 67076377c..61cce3262 100644 --- a/lib/krb5/get_cred.c +++ b/lib/krb5/get_cred.c @@ -715,16 +715,6 @@ add_cred(krb5_context context, krb5_creds const *tkt, krb5_creds ***tgts) return ret; } -static krb5_error_code -get_cred_kdc_capath(krb5_context context, - krb5_kdc_flags flags, - krb5_ccache ccache, - krb5_creds *in_creds, - krb5_principal impersonate_principal, - Ticket *second_ticket, - krb5_creds **out_creds, - krb5_creds ***ret_tgts); - static krb5_error_code get_cred_kdc_capath_worker(krb5_context context, krb5_kdc_flags flags, @@ -766,7 +756,8 @@ get_cred_kdc_capath_worker(krb5_context context, ret = find_cred(context, ccache, tmp_creds.server, *ret_tgts, &tgts); if(ret == 0){ - if (strcmp(try_realm, client_realm) != 0) + /* only allow implicit ok_as_delegate if the realm is the clients realm */ + if (strcmp(try_realm, client_realm) != 0 || strcmp(try_realm, server_realm) != 0) ok_as_delegate = tgts.flags.b.ok_as_delegate; *out_creds = calloc(1, sizeof(**out_creds));