From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 1 Sep 1999 21:41:50 +0000 (+0000)
Subject: disable krb5-mech2 for now; from 1.1 branch
X-Git-Tag: krb5-1.2-beta1~255
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c818be49092e3a346c060ac58ad1b4a93185f2b;p=krb5.git

disable krb5-mech2 for now; from 1.1 branch

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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 4c287d294..893c318d5 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-27  Tom Yu  <tlyu@mit.edu>
+
+	* ftp.c: Diable krb5-mech2 for now.
+
 Tue May 11 11:58:00 1999  Ezra Peisach  <epeisach@mit.edu>
 
 	* ftp.c: Inclusion of gssapi_krb5.h requires gssapi_generic.h.
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index c6e47bdec..bccd2facc 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -1877,9 +1877,7 @@ struct {
     const gss_OID_desc * const * mech_type;
     char *service_name;
 } gss_trials[] = {
-    { &gss_mech_krb5_v2, "ftp" },
     { &gss_mech_krb5, "ftp" },
-    { &gss_mech_krb5_v2, "host" },
     { &gss_mech_krb5, "host" },
 };
 int n_gss_trials = sizeof(gss_trials)/sizeof(gss_trials[0]);
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 9bb42cb26..e05cb51fd 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-27  Tom Yu  <tlyu@mit.edu>
+
+	* client_init.c (_kadm5_init_any): Remove support for krb5-mech2
+	for now.
+
 Thu May 13 17:24:44 1999  Tom Yu  <tlyu@mit.edu>
 
 	* client_init.c (_kadm5_init_any): Use gss_krb5_ccache_name() to
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index e86fbe877..65a313d8d 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -469,29 +469,17 @@ static kadm5_ret_t _kadm5_init_any(char *client_name,
      
 #ifndef INIT_TEST
      handle->clnt->cl_auth = auth_gssapi_create(handle->clnt,
-					&gssstat,
-					&minor_stat,
-					gss_client_creds,
-					gss_target,
-					gss_mech_krb5_v2,
-					GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG,
-					0,
-					NULL,
-					NULL,
-					NULL);
-
-     if (!handle->clnt->cl_auth)
-	 handle->clnt->cl_auth = auth_gssapi_create(handle->clnt,
-					&gssstat,
-					&minor_stat,
-					gss_client_creds,
-					gss_target,
-					gss_mech_krb5,
-					GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG,
-					0,
-					NULL,
-					NULL,
-					NULL);
+						&gssstat,
+						&minor_stat,
+						gss_client_creds,
+						gss_target,
+						gss_mech_krb5,
+						GSS_C_MUTUAL_FLAG
+						| GSS_C_REPLAY_FLAG,
+						0,
+						NULL,
+						NULL,
+						NULL);
 
      (void) gss_release_name(&minor_stat, &gss_target);
 #endif /* ! INIT_TEST */