Implement -e option to list that

shows enctypes associated with a key.

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

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 6bc63eb7aaf8c16c8605df71b5a6057acca96a29..01a2505b1946c8bd8be34230cce0823094e727c4 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,5 +1,7 @@
 Fri Jan 26 00:06:50 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
+       * ktutil.c (ktutil_list): Implement -e option to show enctypes.
+
        * ktutil_funcs.c (ktutil_write_srvtab): Write v4 version
         properly. Previous code was endien dependent.
 

diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index a295c8f2262d008fdc4bd55a57a2bae57cce5ab2..e03764e901c1fd0445bea8b4bf020bee16079aa1 100644 (file)
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -1,7 +1,7 @@
 /*
  * kadmin/ktutil/ktutil.c
  *
- * Copyright 1995 by the Massachusetts Institute of Technology.
+ * Copyright 1995, 1996 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -170,7 +170,7 @@ void ktutil_list(argc, argv)
     krb5_error_code retval;
     krb5_kt_list lp;
     struct tm *stime;
-    int show_time = 0, show_keys = 0;
+    int show_time = 0, show_keys = 0, show_enctype = 0;
     int i, j;
     char *pname;
 
@@ -183,6 +183,12 @@ void ktutil_list(argc, argv)
            show_keys++;
            continue;
        }
+if ( (strlen(argv[i]) == 2)&&
+     (!strncmp(argv[i],"-e",2))) {
+    show_enctype = 1;
+    continue;
+}
+       
        fprintf(stderr, "%s: illegal arguments\n", argv[0]);
        return;
     }
@@ -214,6 +220,16 @@ void ktutil_list(argc, argv)
                printf(fmtbuf);
        }
        printf("%40s", pname);
+       if (show_enctype) {
+           static char buf[256];
+               if ((retval = krb5_enctype_to_string(
+                   lp->entry->key.enctype, buf, 256))) {
+                   com_err(argv[0], retval, "While converting enctype to string");
+                   return;
+               }
+           printf(" (%s) ", buf);
+       }
+       
        if (show_keys) {
            printf(" (0x");
            for (j = 0; j < lp->entry->key.length; j++)