kdb5_edit.c (show_principal): Show key version and last password change

cpw.c: Fix typo in below change in which list was terminated after third
	entry. (extra } removed)

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

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index c85610f1022e0931bfd249ae45a284701289e804..e368ad904ff2f91d6ac1a2a9e9102c7c2ab48718 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 18 03:59:47 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * kdb5_edit.c (show_principal): Show key version and last password
+               change. 
+
+       * cpw.c: Fix typo in below change in which list was terminated
+               after third entry. (extra } removed)
+
 Fri Sep 15 14:21:25 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * cpw.c: Add DES_CBC_MD5 and DES_CBC_CRC with the V4 salt as

diff --git a/src/admin/edit/cpw.c b/src/admin/edit/cpw.c
index c75c73a70d9690c1995fb7dcaa8de5a14842cf6b..9a362e6ecc0ea8660d7266f31e0ea51546cdf388 100644 (file)
--- a/src/admin/edit/cpw.c
+++ b/src/admin/edit/cpw.c
@@ -57,7 +57,7 @@ extern FILE *scriptfile;
 static krb5_key_salt_tuple ks_tuple_rnd_def[] =
        {{ ENCTYPE_DES_CBC_CRC, 0 },
         { ENCTYPE_DES_CBC_MD5, 0 },
-        { ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4}};
+        { ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4},
         { ENCTYPE_DES_CBC_MD5, KRB5_KDB_SALTTYPE_V4}};
 static int ks_tuple_rnd_def_count = 4;
 

diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index 98f6998d79dfefa0d858f0b412465214883ad907..c56015beb9ca4d9666f85e1fbdb0d3982b5ef091 100644 (file)
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -1074,7 +1074,7 @@ void show_principal(argc, argv)
     }
 
     printf("Name: %s\n", pr_name);
-/*    printf("Key version: %d\n", entry.kvno); */
+    printf("Key version: %d\n", entry.mkvno); 
     printf("Maximum life: %s\n", strdur(entry.max_life));
     printf("Maximum renewable life: %s\n", strdur(entry.max_renewable_life));
     printf("Master key version: %d\n", entry.mkvno);
@@ -1085,7 +1085,7 @@ void show_principal(argc, argv)
     printf("Password expiration: %s\n", buffer);
 /*    (void) krb5_timestamp_to_string(entry.last_pw_change,
                                    buffer, sizeof(buffer)); */
-    printf("Last password change: %s\n", buffer);
+/*    printf("Last password change: %s\n", buffer); */
     (void) krb5_timestamp_to_string(entry.last_success,
                                    buffer, sizeof(buffer));
     printf("Last successful password: %s\n", buffer);