]> git.sur5r.net Git - openldap/commitdiff
ITS#5403 fix sasl_ssf retrieval on 64 bit Solaris
authorHoward Chu <hyc@openldap.org>
Wed, 28 May 2008 01:43:05 +0000 (01:43 +0000)
committerHoward Chu <hyc@openldap.org>
Wed, 28 May 2008 01:43:05 +0000 (01:43 +0000)
servers/slapd/syncrepl.c

index d833e969afd5bf54f2e959a5606ea44b0e03008f..0428dfb3ba4b6121a849af12c2145ede0547e3da 100644 (file)
@@ -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;