* init_ctx.c (get_profile_etype_list): Discard DESONLY changes from 1999-09-01,

and revert call sites.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 2ce212922709660da7e42b984a8b06fd9fddf126..be1b180413f70cfaa8907424d08ddf66b474e2cf 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-27  Ken Raeburn  <raeburn@raeburn.org>
+
+       * init_ctx.c (get_profile_etype_list): Discard DESONLY changes
+       from 1999-09-01, and revert call sites.
+
 1999-12-02  Ken Raeburn  <raeburn@mit.edu>
 
        * init_ctx.c (get_profile_etype_list): Report an error if no

diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 6fa773f738eb5ccdf52946c515e6254e7c3f145a..9159a3717d698bb8895692ff96233f72493b4fd1 100644 (file)
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -272,13 +272,12 @@ krb5_set_default_in_tkt_ktypes(context, ktypes)
 }
 
 static krb5_error_code
-get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list, desonly)
+get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list)
      krb5_context context;
      krb5_enctype **ktypes;
      char *profstr;
      int ctx_count;
      krb5_enctype FAR *ctx_list;
-     int desonly;
 {
     krb5_enctype *old_ktypes;
 
@@ -336,21 +335,8 @@ get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list, desonly)
        j = 0;
        i = 1;
        while (1) {
-           if (! krb5_string_to_enctype(sp, &old_ktypes[j])) {
-             switch (old_ktypes[j]) {
-             default:
-               if (desonly)
-                 /* Other types not supported yet.  */
-                 break;
-               /* else fall through */
-
-             case ENCTYPE_NULL:
-             case ENCTYPE_DES_CBC_CRC:
-             case ENCTYPE_DES_CBC_MD5:
+           if (! krb5_string_to_enctype(sp, &old_ktypes[j]))
                j++;
-               break;
-             }
-           }
 
            if (i++ >= count)
                break;
@@ -381,7 +367,7 @@ krb5_get_default_in_tkt_ktypes(context, ktypes)
 {
     return(get_profile_etype_list(context, ktypes, "default_tkt_enctypes",
                                  context->in_tkt_ktype_count,
-                                 context->in_tkt_ktypes, 1));
+                                 context->in_tkt_ktypes));
 }
 
 krb5_error_code
@@ -424,7 +410,7 @@ krb5_get_tgs_ktypes(context, princ, ktypes)
 {
     return(get_profile_etype_list(context, ktypes, "default_tgs_enctypes",
                                  context->tgs_ktype_count,
-                                 context->tgs_ktypes, 1));
+                                 context->tgs_ktypes));
 }
 
 krb5_error_code
@@ -434,7 +420,7 @@ krb5_get_permitted_enctypes(context, ktypes)
 {
     return(get_profile_etype_list(context, ktypes, "permitted_enctypes",
                                  context->tgs_ktype_count,
-                                 context->tgs_ktypes, 0));
+                                 context->tgs_ktypes));
 }
 
 krb5_boolean