limit kadm5 net interface to des for now until gssapi mech is fixed

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

diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 396d4d3a1d662ccea88106be1e6a5b332df5e72c..de4c52557a639e59afda69d138e413e0b145b10a 100644 (file)
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-27  Ken Raeburn  <raeburn@raeburn.org>
+
+       * client_init.c (enctypes): New array, listing only
+       ENCTYPE_DES_CBC_CRC.
+       (_kadm5_init_any): Pass it in krb5_get_in_tkt_with_* calls for
+       now, while GSSAPI/krb5 can only handle DES.
+
 1999-10-26  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,

diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index 65a313d8d1d6ffadfd2f85cb179e180496d9d010..a3d261306c8e27e81517ac57c93e8db8dce80a45 100644 (file)
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -133,6 +133,11 @@ static int preauth_search_list[] = {
      -1
 };
 
+static krb5_enctype enctypes[] = {
+    ENCTYPE_DES_CBC_CRC,
+    0,
+};
+
 static kadm5_ret_t _kadm5_init_any(char *client_name,
                                   enum init_type init_type,
                                   char *pass,
@@ -345,7 +350,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 */
-                                                   NULL,
+                                                   enctypes,
                                                    NULL, /* XXX preauth */
                                                    pass,
                                                    ccache,
@@ -366,7 +371,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 */
-                                                      NULL,
+                                                      enctypes,
                                                       NULL, /* XXX preauth */
                                                       kt,
                                                       ccache,