From: Howard Chu <hyc@openldap.org>
Date: Sat, 6 Oct 2007 14:50:02 +0000 (+0000)
Subject: ITS#3864 use sasl_ssf_t where expected
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~544
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c103b3c9e9251e55c01cb377333a1e58fc12df27;p=openldap

ITS#3864 use sasl_ssf_t where expected
---

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index d9a604efc1..0b3288d2c4 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1448,12 +1448,13 @@ int slap_sasl_external(
 #if SASL_VERSION_MAJOR >= 2
 	int sc;
 	sasl_conn_t *ctx = conn->c_sasl_authctx;
+	sasl_ssf_t sasl_ssf = ssf;
 
 	if ( ctx == NULL ) {
 		return LDAP_UNAVAILABLE;
 	}
 
-	sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &ssf );
+	sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL, &sasl_ssf );
 
 	if ( sc != SASL_OK ) {
 		return LDAP_OTHER;
@@ -1622,7 +1623,7 @@ int slap_sasl_bind( Operation *op, SlapReply *rs )
 	if ( !op->o_conn->c_sasl_bind_in_progress ) {
 		/* If we already authenticated once, must use a new context */
 		if ( op->o_conn->c_sasl_done ) {
-			slap_ssf_t ssf = 0;
+			sasl_ssf_t ssf = 0;
 			const char *authid = NULL;
 #if SASL_VERSION_MAJOR >= 2
 			sasl_getprop( ctx, SASL_SSF_EXTERNAL, (void *)&ssf );