(Hopefully final) rearrangement of KDC database structure

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

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 0431ac1c377f0f52006b008e5506ae89cc55fe50..8da126e126d6c3dc1a510a11d68d95e4feae4602 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -47,7 +47,15 @@ typedef struct _krb5_db_entry {
     krb5_deltat        max_life;
     krb5_deltat        max_renewable_life;
     krb5_kvno mkvno;                   /* master encryption key vno */
-    krb5_timestamp expiration;
+    
+    krb5_timestamp expiration;         /* This is when the client expires */
+    krb5_timestamp pw_expiration;      /* This is when its password does */
+    krb5_timestamp last_pwd_change;    /* Last time of password change  */
+    krb5_timestamp last_success;       /* Last successful password */
+    
+    krb5_timestamp last_failed;                /* Last failed password attempt */
+    krb5_kvno fail_auth_count;                 /* # of failed password attempts */
+    
     krb5_principal mod_name;
     krb5_timestamp mod_date;
     krb5_flags attributes;
@@ -58,12 +66,8 @@ typedef struct _krb5_db_entry {
     krb5_int32 alt_salt_type:8,
               alt_salt_length:24;
     krb5_octet *alt_salt;
-
-    /* SANDIA Enhancement (Pre-Auth/Blacklist) */
-    krb5_timestamp last_pwd_change;    
-    krb5_timestamp last_success;
-    krb5_kvno fail_auth_count;
-    int lastreqid;
+    
+    krb5_int32 expansion[8];
 } krb5_db_entry;
   
 #ifdef SANDIA  /* SANDIA Enhancement (Pre-Auth/Blacklist) */