fix bogus field name (cmsec vs. ctime)

add krb5_tkt_authent, krb5_error

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

diff --git a/src/include/krb5/krb5.h b/src/include/krb5/krb5.h
index b862cf1d985b0287e49f949bb11f879ea75df9ee..fa4743fb8a630f434c938637ab3af04163f9f3a2 100644 (file)
--- a/src/include/krb5/krb5.h
+++ b/src/include/krb5/krb5.h
@@ -60,9 +60,14 @@ typedef struct _krb5_authenticator {
     krb5_principal client;             /* client name/realm */
     krb5_checksum *checksum;           /* checksum, includes type */
     krb5_ui_2 cmsec;                   /* client msec portion */
-    krb5_timestamp cmsec;              /* client sec portion */
+    krb5_timestamp ctime;              /* client sec portion */
 } krb5_authenticator;
 
+typedef struct _krb5_tkt_authent {
+    krb5_ticket ticket;
+    krb5_authenticator authenticator;
+} krb5_tkt_authent;
+
 /* credentials:  Ticket, session key, etc. */
 typedef struct _krb5_credentials {
     krb5_principal client;             /* client's principal identifier */
@@ -95,4 +100,18 @@ typedef struct _krb5_kdc_rep {
     krb5_principal server;             /* server's principal identifier */
     krb5_address **caddrs;             /* array of ptrs to addresses */
 } krb5_kdc_rep;
+
+/* error message structure */
+typedef struct _krb5_error {
+    /* some of these may be meaningless in certain contexts */
+    krb5_timestamp ctime;              /* client sec portion */
+    krb5_ui_2 cmsec;                   /* client msec portion */
+    krb5_ui_2 smsec;                   /* server msec portion */
+    krb5_timestamp stime;              /* server sec portion */
+    krb5_ui_4 error;                   /* error code (protocol error #'s) */
+    krb5_principal client;             /* client's principal identifier */
+    krb5_principal server;             /* client's principal identifier */
+    krb5_string text;                  /* descriptive text */
+} krb5_error;
+
 #endif /* __KRB5_GENERAL__ */