From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 13 Dec 2003 07:10:10 +0000 (+0000)
Subject: don't limit enctype lists at init time
X-Git-Tag: krb5-1.4-beta1~712
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf8647e57515feb15ce49e8c25f12537d7af6438;p=krb5.git

don't limit enctype lists at init time

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

diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 43b352880..8978acf72 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* client_init.c (enctypes): Variable deleted.
+	(_kadm5_init_any): Pass a null pointer instead of enctypes.
+
 2003-01-10  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Add AC_SUBST_FILE marker for lib_frag and libobj_frag.
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 247af875c..cfe1381d9 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -129,14 +129,6 @@ static int preauth_search_list[] = {
      -1
 };
 
-static krb5_enctype enctypes[] = {
-    ENCTYPE_DES3_CBC_SHA1,
-    ENCTYPE_ARCFOUR_HMAC,
-    ENCTYPE_DES_CBC_MD5,
-    ENCTYPE_DES_CBC_CRC,
-    0,
-};
-
 static kadm5_ret_t _kadm5_init_any(char *client_name,
 				   enum init_type init_type,
 				   char *pass,
@@ -367,7 +359,7 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
 	       code = krb5_get_in_tkt_with_password(handle->context,
 						    0, /* no options */
 						    0, /* default addresses */
-						    enctypes,
+						    0,	  /* enctypes */
 						    NULL, /* XXX preauth */
 						    pass,
 						    ccache,
@@ -388,7 +380,7 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
 		    code = krb5_get_in_tkt_with_keytab(handle->context,
 						       0, /* no options */
 						       0, /* default addrs */
-						       enctypes,
+						       0,    /* enctypes */
 						       NULL, /* XXX preauth */
 						       kt,
 						       ccache,