aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/kadm5/clnt/ChangeLog7
-rw-r--r--src/lib/kadm5/clnt/client_init.c9
2 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 396d4d3..de4c525 100644
--- 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 65a313d..a3d2613 100644
--- 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,