From 3bea889f4e00a33b5556f2952577dfe03ab82729 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 16 Jun 1997 03:42:09 +0000 Subject: [PATCH] Adapt to new `krb5_authenticator' git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1913 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/rd_req.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index 481003d91..45d85537b 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -109,22 +109,23 @@ krb5_rd_req_with_keyblock(krb5_context context, memset((*auth_context)->authenticator, 0, sizeof((*auth_context)->authenticator)); + copy_Authenticator(&authenticator, (*auth_context)->authenticator); { - krb5_principal p2; + krb5_principal p1, p2; + krb5_boolean res; - principalname2krb5_principal(&(*auth_context)->authenticator->cname, + principalname2krb5_principal(&p1, authenticator.cname, authenticator.crealm); principalname2krb5_principal(&p2, t->tkt.cname, t->tkt.crealm); - if (!krb5_principal_compare (context, - (*auth_context)->authenticator->cname, - p2)) + res = krb5_principal_compare (context, p1, p2); + krb5_free_principal (context, p1); + krb5_free_principal (context, p2); + if (!res) return KRB5KRB_AP_ERR_BADMATCH; } - (*auth_context)->authenticator->cusec = authenticator.cusec; - (*auth_context)->authenticator->ctime = authenticator.ctime; if (authenticator.seq_number) (*auth_context)->remote_seqnumber = *(authenticator.seq_number); @@ -133,6 +134,8 @@ krb5_rd_req_with_keyblock(krb5_context context, /* XXX - check addresses */ + /* XXX - subkeys? */ + if (ap_req_options) { *ap_req_options = 0; if (ap_req.ap_options.use_session_key)