From: John Kohl <jtkohl@mit.edu>
Date: Thu, 18 Jan 1990 17:34:26 +0000 (+0000)
Subject: rearrange #include order for prototypes to work properly
X-Git-Tag: krb5-1.0-alpha2~1252
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f163cab6d58659d727e11aba901ec40cb63ed04d;p=krb5.git

rearrange #include order for prototypes to work properly
rename credentials to creds
credentials doesn't need encrypt_block, only keybloc,

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@130 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/krb5/krb5.h b/src/include/krb5/krb5.h
index a674ffe8a..30bb9fe35 100644
--- a/src/include/krb5/krb5.h
+++ b/src/include/krb5/krb5.h
@@ -26,8 +26,6 @@
 #include <krb5/fieldbits.h>
 #include <krb5/errors.h>
 #include <krb5/proto.h>
-#include <krb5/ccache.h>
-#include <krb5/rcache.h>
 
 /* Time set */
 typedef struct _krb5_ticket_times {
@@ -81,10 +79,10 @@ typedef struct _krb5_tkt_authent {
 } krb5_tkt_authent;
 
 /* credentials:  Ticket, session key, etc. */
-typedef struct _krb5_credentials {
+typedef struct _krb5_creds {
     krb5_principal client;		/* client's principal identifier */
     krb5_principal server;		/* server's principal identifier */
-    krb5_encrypt_block keyblock;	/* session encryption key info */
+    krb5_keyblock keyblock;		/* session encryption key info */
     krb5_ticket_times times;		/* lifetime info */
     krb5_boolean is_skey;		/* true if ticket is encrypted in
 					   another ticket's skey */
@@ -93,7 +91,7 @@ typedef struct _krb5_credentials {
     krb5_data second_ticket;		/* second ticket, if related to
 					   ticket (via DUPLICATE-SKEY or
 					   ENC-TKT-IN-SKEY) */
-} krb5_credentials;
+} krb5_creds;
 
 /* Last request fields */
 typedef struct _krb5_last_req_entry {
@@ -206,6 +204,10 @@ typedef struct _krb5_priv_enc_part {
     krb5_address **addresses;		/* array of ptrs to addresses */
 } krb5_priv_enc_part;
 
+/* these need to be here so the typedefs are available for the prototypes */
+#include <krb5/ccache.h>
+#include <krb5/rcache.h>
+#include <krb5/keytab.h>
 #include <krb5/func-proto.h>
 
 #endif /* __KRB5_GENERAL__ */