File 0002-Drop-unused-parameter-from-gssapi_spnego_s... of Package cyrus-sasl-saslauthd.14126

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Drop-unused-parameter-from-gssapi_spnego_ssf.patch of Package cyrus-sasl-saslauthd.14126

From 03956557033e7871fe3f6006664504c483518d7d Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Tue, 11 Apr 2017 18:31:46 -0400
Subject: [PATCH 2/4] Drop unused parameter from gssapi_spnego_ssf()

Signed-off-by: Simo Sorce <simo@redhat.com>
---
 plugins/gssapi.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/gssapi.c b/plugins/gssapi.c
index 9da1362..35c3a91 100644
--- a/plugins/gssapi.c
+++ b/plugins/gssapi.c
@@ -624,7 +624,7 @@ static void gssapi_common_mech_free(void *global_context __attribute__((unused))
  * flags negotiated by GSSAPI to determine If confidentiality or integrity are
  * used. These flags are stored in text->qop transalated as layers by the
  * caller */
-static int gssapi_spnego_ssf(context_t *text, const sasl_utils_t *utils,
+static int gssapi_spnego_ssf(context_t *text,
                              sasl_security_properties_t *props,
                              sasl_out_params_t *oparams)
 {
@@ -991,7 +991,7 @@ gssapi_server_mech_authneg(context_t *text,
 	text->state = SASL_GSSAPI_STATE_AUTHENTICATED;
 	ret = SASL_OK;
     } else if (text->mech_type && text->mech_type == &gss_spnego_oid) {
-        ret = gssapi_spnego_ssf(text, params->utils, &params->props, oparams);
+        ret = gssapi_spnego_ssf(text, &params->props, oparams);
     } else {
 	/* Switch to ssf negotiation */
 	text->state = SASL_GSSAPI_STATE_SSFCAP;
@@ -1786,8 +1786,7 @@ static int gssapi_client_mech_step(void *conn_context,
 		return SASL_OK;
 	    } else if (text->mech_type && text->mech_type == &gss_spnego_oid) {
 		oparams->doneflag = 1;
-                return gssapi_spnego_ssf(text, params->utils, &params->props,
-                                         oparams);
+                return gssapi_spnego_ssf(text, &params->props, oparams);
             }
 
 	    /* Switch to ssf negotiation */
-- 
2.25.0

Places

File 0002-Drop-unused-parameter-from-gssapi_spnego_ssf.patch of Package cyrus-sasl-saslauthd.14126

Places