From 30250940c5a29ea330903946106a09085f0c5f80 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 15 Feb 1999 21:02:39 +0000
Subject: [PATCH] (init_auth): remove unnecessary gssapi_krb5_init.  ask for
 KEYTYPE_DES credentials

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5364 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/init_sec_context.c      | 15 +++++++--------
 lib/gssapi/krb5/init_sec_context.c | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
index 41afe6464..f14a791fe 100644
--- a/lib/gssapi/init_sec_context.c
+++ b/lib/gssapi/init_sec_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -69,8 +69,6 @@ init_auth
   Checksum cksum;
   krb5_enctype enctype;
 
-  gssapi_krb5_init ();
-
   outbuf.length = 0;
   outbuf.data   = NULL;
 
@@ -155,12 +153,13 @@ init_auth
   }
 
   memset(&this_cred, 0, sizeof(this_cred));
-  this_cred.client = (*context_handle)->source;
-  this_cred.server = (*context_handle)->target;
-  this_cred.times.endtime = 0;
-
+  this_cred.client          = (*context_handle)->source;
+  this_cred.server          = (*context_handle)->target;
+  this_cred.times.endtime   = 0;
+  this_cred.session.keytype = KEYTYPE_DES;
+  
   kret = krb5_get_credentials (gssapi_krb5_context,
-			       0,
+			       KRB5_TC_MATCH_KEYTYPE,
 			       ccache,
 			       &this_cred,
 			       &cred);
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 41afe6464..f14a791fe 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -69,8 +69,6 @@ init_auth
   Checksum cksum;
   krb5_enctype enctype;
 
-  gssapi_krb5_init ();
-
   outbuf.length = 0;
   outbuf.data   = NULL;
 
@@ -155,12 +153,13 @@ init_auth
   }
 
   memset(&this_cred, 0, sizeof(this_cred));
-  this_cred.client = (*context_handle)->source;
-  this_cred.server = (*context_handle)->target;
-  this_cred.times.endtime = 0;
-
+  this_cred.client          = (*context_handle)->source;
+  this_cred.server          = (*context_handle)->target;
+  this_cred.times.endtime   = 0;
+  this_cred.session.keytype = KEYTYPE_DES;
+  
   kret = krb5_get_credentials (gssapi_krb5_context,
-			       0,
+			       KRB5_TC_MATCH_KEYTYPE,
 			       ccache,
 			       &this_cred,
 			       &cred);