From 0b248a79c97d139d8c7a76a8ad2b4c34dbe04426 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 9 Aug 2000 18:40:29 +0000 Subject: * cnv_tkt_skey.c: Fix up static prototypes for krb524int_krb_create_ticket(), krb524int_krb_cr_tkt_krb5(), and krb524int_krb_cr_tkt_int(), as well as their definitions, so that there aren't bare identifiers in the prototypes and so that there aren't narrow types in the definitions. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12617 dc483132-0cff-0310-8789-dd5450dbe970 --- src/krb524/ChangeLog | 8 ++++++++ src/krb524/cnv_tkt_skey.c | 42 ++++++++++++++++++++---------------------- 2 files changed, 28 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 1cb90f42a1..0112ab16d3 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,11 @@ +2000-08-09 Tom Yu + + * cnv_tkt_skey.c: Fix up static prototypes for + krb524int_krb_create_ticket(), krb524int_krb_cr_tkt_krb5(), and + krb524int_krb_cr_tkt_int(), as well as their definitions, so that + there aren't bare identifiers in the prototypes and so that there + aren't narrow types in the definitions. + 2000-07-20 Danilo Almeida * Makefile.in: Fix build so we don't try to build an extra lib. diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c index 521e8587ea..b4fe386ff9 100644 --- a/src/krb524/cnv_tkt_skey.c +++ b/src/krb524/cnv_tkt_skey.c @@ -32,19 +32,19 @@ #include #include "krb524.h" -static -int -krb524int_krb_create_ticket(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, key, k5key); +static int +krb524int_krb_create_ticket(KTEXT, unsigned int, char *, char *, char *, long, + char *, int, long, char *, char *, C_Block); -static -int -krb524int_krb_cr_tkt_krb5(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, k5key); +static int +krb524int_krb_cr_tkt_krb5(KTEXT, unsigned int, char *, char *, char *, long, + char *, int, long, char *, char *, + krb5_keyblock *); static int -krb524int_krb_cr_tkt_int(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, key, k5key); +krb524int_krb_cr_tkt_int(KTEXT, unsigned int, char *, char *, char *, long, + char *, int, long, char *, char *, C_Block, + krb5_keyblock *); /* rather than copying the cmu code, these values are derived from a calculation based on the table and comments found there. @@ -277,18 +277,17 @@ static const int temp_ONE = 1; * <=7 bytes null null pad to 8 byte multiple * */ -static -int +static int krb524int_krb_create_ticket(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, key, k5key) + session, life, time_sec, sname, sinstance, key) KTEXT tkt; /* Gets filled in by the ticket */ - unsigned char flags; /* Various Kerberos flags */ + unsigned int flags; /* Various Kerberos flags */ char *pname; /* Principal's name */ char *pinstance; /* Principal's instance */ char *prealm; /* Principal's authentication domain */ long paddress; /* Net address of requesting entity */ char *session; /* Session key inserted in ticket */ - short life; /* Lifetime of the ticket */ + int life; /* Lifetime of the ticket */ long time_sec; /* Issue time and date */ char *sname; /* Service Name */ char *sinstance; /* Instance Name */ @@ -299,18 +298,17 @@ krb524int_krb_create_ticket(tkt, flags, pname, pinstance, prealm, paddress, sinstance, key, NULL); } -static -int +static int krb524int_krb_cr_tkt_krb5(tkt, flags, pname, pinstance, prealm, paddress, - session, life, time_sec, sname, sinstance, k5key) + session, life, time_sec, sname, sinstance, k5key) KTEXT tkt; /* Gets filled in by the ticket */ - unsigned char flags; /* Various Kerberos flags */ + unsigned int flags; /* Various Kerberos flags */ char *pname; /* Principal's name */ char *pinstance; /* Principal's instance */ char *prealm; /* Principal's authentication domain */ long paddress; /* Net address of requesting entity */ char *session; /* Session key inserted in ticket */ - short life; /* Lifetime of the ticket */ + int life; /* Lifetime of the ticket */ long time_sec; /* Issue time and date */ char *sname; /* Service Name */ char *sinstance; /* Instance Name */ @@ -327,13 +325,13 @@ static int krb524int_krb_cr_tkt_int(tkt, flags, pname, pinstance, prealm, paddress, session, life, time_sec, sname, sinstance, key, k5key) KTEXT tkt; /* Gets filled in by the ticket */ - unsigned char flags; /* Various Kerberos flags */ + unsigned int flags; /* Various Kerberos flags */ char *pname; /* Principal's name */ char *pinstance; /* Principal's instance */ char *prealm; /* Principal's authentication domain */ long paddress; /* Net address of requesting entity */ char *session; /* Session key inserted in ticket */ - short life; /* Lifetime of the ticket */ + int life; /* Lifetime of the ticket */ long time_sec; /* Issue time and date */ char *sname; /* Service Name */ char *sinstance; /* Instance Name */ -- cgit