remove gss krb5 mech2 oid and oidset variables

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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index a7982c63475f9e4e74ae21dabb50e9809ba72dec..f7a8b0a3016974d27b50b4269a19291b912037e8 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,5 +1,17 @@
 2002-07-01  Ken Raeburn  <raeburn@mit.edu>
 
+       * gssapi_krb5.c (gss_mech_krb5_v2, gss_mech_set_krb5_v2,
+       gss_mech_set_krb5_v1v2): Delete variables.
+       * gssapi_krb5.h (gss_mech_krb5_v2, gss_mech_set_krb5_v2,
+       gss_mech_set_krb5_v1v2): Delete declarations.
+       * add_cred.c (krb5_gss_add_cred): Delete uses of them.
+       * canon_name.c (krb5_gss_canonicalize_name): Ditto.
+       * disp_status.c (krb5_gss_display_status): Ditto.
+       * indicate_mechs.c (krb5_gss_indicate_mechs): Ditto.
+       * inq_cred.c (krb5_gss_inquire_cred_by_mech): Ditto.
+       * inq_names.c (krb5_gss_inquire_names_for_mech): Ditto.
+       * rel_oid.c (krb5_gss_internal_release_oid): Ditto.
+
        * accept_sec_context.c (rd_and_store_for_creds): Extra parens
        around assignments to quiet gcc.
        (krb5_gss_accept_sec_context): Fix some type mismatches between

diff --git a/src/lib/gssapi/krb5/add_cred.c b/src/lib/gssapi/krb5/add_cred.c
index ab393ee29ad6ee92349756c551a4e5a32a55d44f..4bbee5ef367b0dce50a5f39ec88043d7f55b68ad 100644 (file)
--- a/src/lib/gssapi/krb5/add_cred.c
+++ b/src/lib/gssapi/krb5/add_cred.c
@@ -89,8 +89,7 @@ krb5_gss_add_cred(minor_status, input_cred_handle,
 
     /* check if the desired_mech is bogus */
 
-    if (!g_OID_equal(desired_mech, gss_mech_krb5_v2) &&
-       !g_OID_equal(desired_mech, gss_mech_krb5) &&
+    if (!g_OID_equal(desired_mech, gss_mech_krb5) &&
        !g_OID_equal(desired_mech, gss_mech_krb5_old)) {
        *minor_status = 0;
        return(GSS_S_BAD_MECH);

diff --git a/src/lib/gssapi/krb5/canon_name.c b/src/lib/gssapi/krb5/canon_name.c
index 169fe6b584fb6c0e88cc6e54118711c8a4fe1b2a..aed67c3527377c85a5b230db661f747619666c3b 100644 (file)
--- a/src/lib/gssapi/krb5/canon_name.c
+++ b/src/lib/gssapi/krb5/canon_name.c
@@ -34,8 +34,7 @@ OM_uint32 krb5_gss_canonicalize_name(OM_uint32  *minor_status,
                                     const gss_OID mech_type,
                                     gss_name_t *output_name)
 {
-    if (!g_OID_equal(gss_mech_krb5_v2, mech_type) &&
-       !g_OID_equal(gss_mech_krb5, mech_type) &&
+    if (!g_OID_equal(gss_mech_krb5, mech_type) &&
        !g_OID_equal(gss_mech_krb5_old, mech_type)) {
        *minor_status = 0;
        return(GSS_S_BAD_MECH);

diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c
index 3a6ba7b1ae76f270a8ab0abe3e73c70604eccef1..0b296f6ce6be3c0dfaf0cfc590f1203cf3f69e5d 100644 (file)
--- a/src/lib/gssapi/krb5/disp_status.c
+++ b/src/lib/gssapi/krb5/disp_status.c
@@ -49,7 +49,6 @@ krb5_gss_display_status(minor_status, status_value, status_type,
       return(GSS_S_FAILURE);
 
    if ((mech_type != GSS_C_NULL_OID) &&
-       !g_OID_equal(gss_mech_krb5_v2, mech_type) &&
        !g_OID_equal(gss_mech_krb5, mech_type) &&
        !g_OID_equal(gss_mech_krb5_old, mech_type)) {
        *minor_status = 0;

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 7293c6dc0ce029c1bd1128754cd08ce489156359..efcf36c86e8b98729e3490bc88510f74f01444a1 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -100,7 +100,6 @@ const gss_OID_desc krb5_gss_oid_array[] = {
 
 const gss_OID_desc * const gss_mech_krb5 = krb5_gss_oid_array+0;
 const gss_OID_desc * const gss_mech_krb5_old = krb5_gss_oid_array+1;
-const gss_OID_desc * const gss_mech_krb5_v2 = krb5_gss_oid_array+2;
 const gss_OID_desc * const gss_nt_krb5_name = krb5_gss_oid_array+3;
 const gss_OID_desc * const gss_nt_krb5_principal = krb5_gss_oid_array+4;
 
@@ -115,8 +114,6 @@ static const gss_OID_set_desc oidsets[] = {
 const gss_OID_set_desc * const gss_mech_set_krb5 = oidsets+0;
 const gss_OID_set_desc * const gss_mech_set_krb5_old = oidsets+1;
 const gss_OID_set_desc * const gss_mech_set_krb5_both = oidsets+2;
-const gss_OID_set_desc * const gss_mech_set_krb5_v2 = oidsets+3;
-const gss_OID_set_desc * const gss_mech_set_krb5_v1v2 = oidsets+4;
 
 void *kg_vdb = NULL;
 

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.h b/src/lib/gssapi/krb5/gssapi_krb5.h
index ea599464bfb75eb998f352dbbce1bddd5914cb79..da2e94e7e067fb0a54aaad538a6d42fc57509acc 100644 (file)
--- a/src/lib/gssapi/krb5/gssapi_krb5.h
+++ b/src/lib/gssapi/krb5/gssapi_krb5.h
@@ -32,12 +32,9 @@ extern "C" {
 
 extern const gss_OID_desc * const gss_mech_krb5;
 extern const gss_OID_desc * const gss_mech_krb5_old;
-extern const gss_OID_desc * const gss_mech_krb5_v2;
 extern const gss_OID_set_desc * const gss_mech_set_krb5;
 extern const gss_OID_set_desc * const gss_mech_set_krb5_old;
 extern const gss_OID_set_desc * const gss_mech_set_krb5_both;
-extern const gss_OID_set_desc * const gss_mech_set_krb5_v2;
-extern const gss_OID_set_desc * const gss_mech_set_krb5_v1v2;
 
 extern const gss_OID_desc * const gss_nt_krb5_name;
 extern const gss_OID_desc * const gss_nt_krb5_principal;

diff --git a/src/lib/gssapi/krb5/indicate_mechs.c b/src/lib/gssapi/krb5/indicate_mechs.c
index 9718113044754152adb9b9e500b24fd06725cdeb..48baf1a0e58660f97774f7185320ef00ada9e882 100644 (file)
--- a/src/lib/gssapi/krb5/indicate_mechs.c
+++ b/src/lib/gssapi/krb5/indicate_mechs.c
@@ -33,7 +33,7 @@ krb5_gss_indicate_mechs(minor_status, mech_set)
 {
    *minor_status = 0;
 
-   if (! g_copy_OID_set(gss_mech_set_krb5_v1v2, mech_set)) {
+   if (! g_copy_OID_set(gss_mech_set_krb5_both, mech_set)) {
          *mech_set     = GSS_C_NO_OID_SET;
          *minor_status = ENOMEM;
          return(GSS_S_FAILURE);

diff --git a/src/lib/gssapi/krb5/inq_cred.c b/src/lib/gssapi/krb5/inq_cred.c
index 6fbbadcbebe48ceb2aac13eb51680062100888a8..88001ff4edee86e90ba8e28a4f947c06ab0bc524 100644 (file)
--- a/src/lib/gssapi/krb5/inq_cred.c
+++ b/src/lib/gssapi/krb5/inq_cred.c
@@ -201,8 +201,7 @@ krb5_gss_inquire_cred_by_mech(minor_status, cred_handle,
      */
     if ((mech_type != GSS_C_NULL_OID) &&
        !g_OID_equal(gss_mech_krb5_old, mech_type) &&
-       !g_OID_equal(gss_mech_krb5, mech_type) &&
-       !g_OID_equal(gss_mech_krb5_v2, mech_type)) {
+       !g_OID_equal(gss_mech_krb5, mech_type)) {
        *minor_status = 0;
        return(GSS_S_NO_CRED);
     }

diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c
index ba95a3bc128b12de31e4c3fc4d69b2f41e693006..dc624720403b201cde12c8999308411e811984cf 100644 (file)
--- a/src/lib/gssapi/krb5/inq_names.c
+++ b/src/lib/gssapi/krb5/inq_names.c
@@ -46,7 +46,6 @@ krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
      * We only know how to handle our own mechanism.
      */
     if ((mechanism != GSS_C_NULL_OID) &&
-       !g_OID_equal(gss_mech_krb5_v2, mechanism) &&
        !g_OID_equal(gss_mech_krb5, mechanism) &&
        !g_OID_equal(gss_mech_krb5_old, mechanism)) {
        *minor_status = 0;

diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c
index 066daf4147cccae8cc316bac34a2a1a767673e34..ae6f5e5f5e9f667590e2aa8c8da35dccb4215ca8 100644 (file)
--- a/src/lib/gssapi/krb5/rel_oid.c
+++ b/src/lib/gssapi/krb5/rel_oid.c
@@ -66,8 +66,7 @@ krb5_gss_internal_release_oid(minor_status, oid)
      * return GSS_S_CONTINUE_NEEDED for any OIDs it does not recognize.
      */
    
-    if ((*oid != gss_mech_krb5_v2) &&
-       (*oid != gss_mech_krb5) &&
+    if ((*oid != gss_mech_krb5) &&
        (*oid != gss_mech_krb5_old) &&
        (*oid != gss_nt_krb5_name) &&
        (*oid != gss_nt_krb5_principal)) {