From: Howard Chu <hyc@openldap.org>
Date: Wed, 28 May 2008 01:43:05 +0000 (+0000)
Subject: ITS#5403 fix sasl_ssf retrieval on 64 bit Solaris
X-Git-Tag: LOCKER_IDS~138
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61a70b4f964ed39df41a1f25f3b77c621670b106;p=openldap

ITS#5403 fix sasl_ssf retrieval on 64 bit Solaris
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index d833e969af..0428dfb3ba 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -568,7 +568,12 @@ do_syncrep1(
 		op->o_tls_ssf = ldap_pvt_tls_get_strength( ssl );
 	}
 #endif /* HAVE_TLS */
-	ldap_get_option( si->si_ld, LDAP_OPT_X_SASL_SSF, &op->o_sasl_ssf );
+	{
+		ber_len_t ssf; /* ITS#5403, 3864 LDAP_OPT_X_SASL_SSF probably ought
+						  to use sasl_ssf_t but currently uses ber_len_t */
+		ldap_get_option( si->si_ld, LDAP_OPT_X_SASL_SSF, &ssf );
+		op->o_sasl_ssf = ssf;
+	}
 	op->o_ssf = ( op->o_sasl_ssf > op->o_tls_ssf )
 		?  op->o_sasl_ssf : op->o_tls_ssf;