cleanup

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

diff --git a/plugins/gssapi.c b/plugins/gssapi.c
index 0e6cf2b..947418e 100644 (file)
--- a/plugins/gssapi.c
+++ b/plugins/gssapi.c
@@ -757,7 +757,7 @@ gssapi_server_mech_step(void *conn_context,
        maj_stat =
            gss_accept_sec_context(&min_stat,
                                   &(text->gss_ctx),
-                                  text->server_creds,
+                                  params->gss_creds ? params->gss_creds : text->server_creds,
                                   input_token,
                                   GSS_C_NO_CHANNEL_BINDINGS,
                                   &text->client_name,
@@ -1274,9 +1274,10 @@ static sasl_server_plug_t gssapi_server_plugins[] =
        NULL,                           /* mech_avail */
        NULL                            /* spare */
     },
+#if 0
     {
        "GSS-EAP",                      /* mech_name */
-       256,                            /* max_ssf */
+       128,                            /* max_ssf */
        SASL_SEC_NOPLAINTEXT
        | SASL_SEC_NOACTIVE
        | SASL_SEC_MUTUAL_AUTH,         /* security_flags */
@@ -1293,6 +1294,7 @@ static sasl_server_plug_t gssapi_server_plugins[] =
        NULL,                           /* mech_avail */
        NULL                            /* spare */
     }
+#endif
 };
 
 int gssapiv2_server_plug_init(
@@ -1994,6 +1996,7 @@ static sasl_client_plug_t gssapi_client_plugins[] =
        NULL,                           /* spare */
        NULL                            /* spare */
     },
+#if 0
     {
        "GSS-EAP",                      /* mech_name */
        128,                            /* max_ssf */
@@ -2015,6 +2018,7 @@ static sasl_client_plug_t gssapi_client_plugins[] =
        NULL,                           /* spare */
        NULL                            /* spare */
     },
+#endif
 };
 
 int gssapiv2_client_plug_init(const sasl_utils_t *utils __attribute__((unused)),