2c2
< * Copyright (c) 1997 - 2001 Kungliga Tekniska H�gskolan
---
> * Copyright (c) 1997 - 2002 Kungliga Tekniska H�gskolan
35c35
< RCSID("$Id: convert_creds.c,v 1.24 2001/06/20 02:49:21 joda Exp $");
---
> RCSID("$Id: convert_creds.c,v 1.26 2003/03/18 03:11:16 lha Exp $");
36a37,38
> #include "krb5-v4compat.h"
>
45,80d46
< #define MAX_KTXT_LEN 1250
<
< #define ANAME_SZ 40
< #define REALM_SZ 40
< #define SNAME_SZ 40
< #define INST_SZ 40
<
< struct ktext {
< unsigned int length; /* Length of the text */
< unsigned char dat[MAX_KTXT_LEN]; /* The data itself */
< u_int32_t mbz; /* zero to catch runaway strings */
< };
<
< struct credentials {
< char service[ANAME_SZ]; /* Service name */
< char instance[INST_SZ]; /* Instance */
< char realm[REALM_SZ]; /* Auth domain */
< des_cblock session; /* Session key */
< int lifetime; /* Lifetime */
< int kvno; /* Key version number */
< struct ktext ticket_st; /* The ticket itself */
< int32_t issue_date; /* The issue time */
< char pname[ANAME_SZ]; /* Principal's name */
< char pinst[INST_SZ]; /* Principal's instance */
< };
<
<
< #define TKTLIFENUMFIXED 64
< #define TKTLIFEMINFIXED 0x80
< #define TKTLIFEMAXFIXED 0xBF
< #define TKTLIFENOEXPIRE 0xFF
< #define MAXTKTLIFETIME (30*24*3600) /* 30 days */
< #ifndef NEVERDATE
< #define NEVERDATE ((time_t)0x7fffffffL)
< #endif
<
92,93c58,59
< static int
< _krb_time_to_life(time_t start, time_t end)
---
> int
> _krb5_krb_time_to_life(time_t start, time_t end)
115a82,101
> time_t
> _krb5_krb_life_to_time(int start, int life_)
> {
> unsigned char life = (unsigned char) life_;
>
> #if 0
> if (krb_no_long_lifetimes)
> return start + life*5*60;
> #endif
>
> if (life == TKTLIFENOEXPIRE)
> return NEVERDATE;
> if (life < TKTLIFEMINFIXED)
> return start + life*5*60;
> if (life > TKTLIFEMAXFIXED)
> return start + MAXTKTLIFETIME;
> return start + _tkt_lifetimes[life - TKTLIFEMINFIXED];
> }
>
>
186,187c172,173
< v4creds->lifetime = _krb_time_to_life(v4creds->issue_date,
< v5_creds->times.endtime);
---
> v4creds->lifetime = _krb5_krb_time_to_life(v4creds->issue_date,
> v5_creds->times.endtime);