* ktutil_funcs.c : Do appropriate magic for enctype/keytype cleanup

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

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 9aab9650a3a2b87bc7d70e3ea55fc852adf3de76..65eb3827107247063d51e8da50fd5566ce91807c 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,8 @@
+
+Thu Sep 07 15:06:57 1995  Chris Provenzano (proven@mit.edu)
+
+       * ktutil_funcs.c : Do appropriate magic for enctype/keytype cleanup.
+
 Thu Aug 24 19:20:26 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * .Sanitize: Added .Sanitize file.

diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
index 2702c840e83143c5035a80a82496e334e908d019..9143b7fb6a3a7eb59f0573e7aaef09aaf0800238 100644 (file)
--- a/src/kadmin/ktutil/ktutil_funcs.c
+++ b/src/kadmin/ktutil/ktutil_funcs.c
@@ -255,8 +255,7 @@ krb5_error_code ktutil_read_srvtab(context, name, list)
        if (retval)
            break;
        entry->key.magic = KV5M_KEYBLOCK;
-       entry->key.etype = ETYPE_UNKNOWN;
-       entry->key.keytype = KEYTYPE_DES;
+       entry->key.enctype = ENCTYPE_DES_CBC_CRC;
        entry->key.length = sizeof (key);
        entry->key.contents = (krb5_octet *)malloc(sizeof (key));
        if (!entry->key.contents) {
@@ -303,7 +302,7 @@ krb5_error_code ktutil_read_srvtab(context, name, list)
 /*
  * Writes a kt_list out to a krb4 srvtab file.  Note that it first
  * prunes the kt_list so that it won't contain any keys that are not
- * the most recent, and ignores keys that are not KEYTYPE_DES.
+ * the most recent, and ignores keys that are not ENCTYPE_DES.
  */
 krb5_error_code ktutil_write_srvtab(context, list, name)
     krb5_context context;
@@ -319,7 +318,7 @@ krb5_error_code ktutil_write_srvtab(context, list, name)
 
     /* First do heinous stuff to prune the list. */
     for (lp = list; lp; lp = lp->next) {
-       if (lp->entry->key.keytype == KEYTYPE_DES) { /* only DES keys! */
+       if (lp->entry->key.enctype == ENCTYPE_DES_CBC_CRC) {/* only DES keys! */
            for (lp1 = pruned; lp1; prev = lp1, lp1 = lp1->next) {
                /* Hunt for the current principal in the pruned list */
                if (krb5_principal_compare(context,