* 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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 1cb90f42a11af53731c68edb27e46761466d1b87..0112ab16d38b9fb8b2581e3c73a4790ee6962f3e 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-09  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <dalmeida@mit.edu>
 
        * 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 521e8587ea4a647c8f426799aba6d9e1055b5d72..b4fe386ff9b1ffcadafc52f1132cfbca48c171d0 100644 (file)
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -32,19 +32,19 @@
 #include <krb.h>
 #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 */