disable OID check to get IAKERB to work

[cyrus-sasl.git] / plugins / gs2.c

diff --git a/plugins/gs2.c b/plugins/gs2.c
index bfabc4b..c3bf0a6 100644 (file)
--- a/plugins/gs2.c
+++ b/plugins/gs2.c
@@ -156,7 +156,8 @@ static int gs2_make_message(context_t *text,
 static int gs2_get_mech_attrs(const sasl_utils_t *utils,
                               const gss_OID mech,
                               unsigned int *security_flags,
-                              unsigned int *features);
+                              unsigned int *features,
+                              const unsigned long **prompts);
 
 static int gs2_indicate_mechs(const sasl_utils_t *utils);
 
@@ -245,13 +246,6 @@ sasl_gs2_free_context_contents(context_t *text)
         text->authzid = NULL;
     }
 
-#if 0
-    if (text->mechanism != NULL) {
-        gss_release_oid(&min_stat, &text->mechanism);
-        text->mechanism = GSS_C_NO_OID;
-    }
-#endif
-
     gss_release_buffer(&min_stat, &text->gss_cbindings.application_data);
 
     if (text->out_buf != NULL) {
@@ -453,10 +447,12 @@ gs2_server_mech_step(void *conn_context,
 
     assert(maj_stat == GSS_S_COMPLETE);
 
+#if 0
     if (!g_OID_equal(text->mechanism, actual_mech)) {
         ret = SASL_WRONGMECH;
         goto cleanup;
     }
+#endif
     if ((out_flags & GSS_C_SEQUENCE_FLAG) == 0)  {
         ret = SASL_BADAUTH;
         goto cleanup;
@@ -551,7 +547,6 @@ cleanup:
     gss_release_buffer(&min_stat, &short_name_buf);
     gss_release_buffer(&min_stat, &output_token);
     gss_release_name(&min_stat, &without);
-    gss_release_oid(&min_stat, &actual_mech);
 
     if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) {
         sasl_gs2_seterror(text->utils, maj_stat, min_stat);
@@ -636,7 +631,8 @@ gs2_server_plug_alloc(const sasl_utils_t *utils,
 
     ret = gs2_get_mech_attrs(utils, mech,
                              &splug->security_flags,
-                             &splug->features);
+                             &splug->features,
+                             NULL);
     if (ret != SASL_OK)
         return ret;
 
@@ -894,7 +890,6 @@ static int gs2_client_mech_step(void *conn_context,
 cleanup:
     gss_release_buffer(&min_stat, &output_token);
     gss_release_buffer(&min_stat, &name_buf);
-    gss_release_oid(&min_stat, &actual_mech);
 
     if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) {
         sasl_gs2_seterror(text->utils, maj_stat, min_stat);
@@ -937,10 +932,6 @@ static int gs2_client_mech_new(void *glob_context,
     return SASL_OK;
 }
 
-static const unsigned long gs2_required_prompts[] = {
-    SASL_CB_LIST_END
-};
-
 static int
 gs2_client_plug_alloc(const sasl_utils_t *utils,
                       void *plug,
@@ -955,7 +946,8 @@ gs2_client_plug_alloc(const sasl_utils_t *utils,
 
     ret = gs2_get_mech_attrs(utils, mech,
                              &cplug->security_flags,
-                             &cplug->features);
+                             &cplug->features,
+                             &cplug->required_prompts);
     if (ret != SASL_OK)
         return ret;
 
@@ -970,7 +962,6 @@ gs2_client_plug_alloc(const sasl_utils_t *utils,
     cplug->mech_step = gs2_client_mech_step;
     cplug->mech_dispose = gs2_common_mech_dispose;
     cplug->mech_free = gs2_common_mech_free;
-    cplug->required_prompts = gs2_required_prompts;
 
     return SASL_OK;
 }
@@ -1327,6 +1318,10 @@ gs2_make_message(context_t *text,
     return SASL_OK;
 }
 
+static const unsigned long gs2_required_prompts[] = {
+    SASL_CB_LIST_END
+};
+
 /*
  * Map GSS mechanism attributes to SASL ones
  */
@@ -1334,10 +1329,11 @@ static int
 gs2_get_mech_attrs(const sasl_utils_t *utils,
                    const gss_OID mech,
                    unsigned int *security_flags,
-                   unsigned int *features)
+                   unsigned int *features,
+                   const unsigned long **prompts)
 {
     OM_uint32 major, minor;
-    int present, ret;
+    int present;
     gss_OID_set attrs = GSS_C_NO_OID_SET;
 
     major = gss_inquire_attrs_for_mech(&minor, mech, &attrs, NULL);
@@ -1349,13 +1345,13 @@ gs2_get_mech_attrs(const sasl_utils_t *utils,
 
     *security_flags = SASL_SEC_NOPLAINTEXT | SASL_SEC_NOACTIVE;
     *features = SASL_FEAT_WANT_CLIENT_FIRST | SASL_FEAT_CHANNEL_BINDING;
+    if (prompts != NULL)
+        *prompts = gs2_required_prompts;
 
 #define MA_PRESENT(a)   (gss_test_oid_set_member(&minor, (gss_OID)(a), \
                                                  attrs, &present) == GSS_S_COMPLETE && \
                          present)
 
-    ret = SASL_OK;
-
     if (MA_PRESENT(GSS_C_MA_PFS))
         *security_flags |= SASL_SEC_FORWARD_SECRECY;
     if (!MA_PRESENT(GSS_C_MA_AUTH_INIT_ANON))
@@ -1364,11 +1360,14 @@ gs2_get_mech_attrs(const sasl_utils_t *utils,
         *security_flags |= SASL_SEC_PASS_CREDENTIALS;
     if (MA_PRESENT(GSS_C_MA_AUTH_TARG))
         *security_flags |= SASL_SEC_MUTUAL_AUTH;
+    if (MA_PRESENT(GSS_C_MA_AUTH_INIT_INIT) && prompts != NULL)
+        *prompts = NULL;
     if (MA_PRESENT(GSS_C_MA_ITOK_FRAMED))
         *features |= SASL_FEAT_GSS_FRAMING;
 
     gss_release_oid_set(&minor, &attrs);
-    return ret;
+
+    return SASL_OK;
 }
 
 /*