diff options
| author | Mark Murray <markm@FreeBSD.org> | 2000-02-24 11:07:16 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 2000-02-24 11:07:16 +0000 |
| commit | 13e3f4d6d9d9c48a270a1a18a92e57a56f0a7059 (patch) | |
| tree | 2e1873a5f9196289affc301c4d3c862d04a3f4c8 /crypto/heimdal/lib/krb5/rd_req.c | |
| parent | b528cefc6b8f9670b31a865051741d946cb37085 (diff) | |
Diffstat (limited to 'crypto/heimdal/lib/krb5/rd_req.c')
| -rw-r--r-- | crypto/heimdal/lib/krb5/rd_req.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/heimdal/lib/krb5/rd_req.c b/crypto/heimdal/lib/krb5/rd_req.c index 9f8df1d6f3276..236ecb40e2aca 100644 --- a/crypto/heimdal/lib/krb5/rd_req.c +++ b/crypto/heimdal/lib/krb5/rd_req.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include <krb5_locl.h> -RCSID("$Id: rd_req.c,v 1.38 1999/12/02 17:05:12 joda Exp $"); +RCSID("$Id: rd_req.c,v 1.40 2000/02/06 05:20:31 assar Exp $"); static krb5_error_code decrypt_tkt_enc_part (krb5_context context, @@ -128,7 +128,7 @@ krb5_decrypt_ticket(krb5_context context, return ret; { - int32_t now; + krb5_timestamp now; time_t start = t.authtime; krb5_timeofday (context, &now); @@ -202,13 +202,13 @@ krb5_verify_ap_req(krb5_context context, krb5_auth_context ac; krb5_error_code ret; - if(auth_context){ + if(auth_context) { if(*auth_context == NULL){ krb5_auth_con_init(context, &ac); *auth_context = ac; }else ac = *auth_context; - }else + } else krb5_auth_con_init(context, &ac); if (ap_req->ap_options.use_session_key && ac->keyblock){ @@ -343,7 +343,7 @@ get_key_from_keytab(krb5_context context, krb5_ap_req *ap_req, krb5_const_principal server, krb5_keytab keytab, - krb5_keyblock **out) + krb5_keyblock **out_key) { krb5_keytab_entry entry; krb5_error_code ret; @@ -368,7 +368,7 @@ get_key_from_keytab(krb5_context context, &entry); if(ret) goto out; - ret = krb5_copy_keyblock(context, &entry.keyblock, out); + ret = krb5_copy_keyblock(context, &entry.keyblock, out_key); krb5_kt_free_entry (context, &entry); out: if(keytab == NULL) |