From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 28 Aug 2004 21:58:20 +0000 (+0000)
Subject: TLS SSF does not imply a transport_ssf.
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~602
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c449fdd2176d9abff625fc020fd573dca805c101;p=openldap

TLS SSF does not imply a transport_ssf.
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index e2de42ec6e..5f9cd34869 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -312,15 +312,17 @@ do_syncrep1(
 	/* Set SSF to strongest of TLS, SASL SSFs */
 	op->o_sasl_ssf = 0;
 	op->o_tls_ssf = 0;
+	op->o_transport_ssf = 0;
 #ifdef HAVE_TLS
-	if ( ldap_get_option( si->si_ld, LDAP_OPT_X_TLS_SSL_CTX, &ssl ) == LDAP_SUCCESS &&
-	     ssl != NULL ) {
+	if ( ldap_get_option( si->si_ld, LDAP_OPT_X_TLS_SSL_CTX, &ssl )
+		== LDAP_SUCCESS && ssl != NULL )
+	{
 		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 );
-	op->o_transport_ssf = op->o_ssf = ( op->o_sasl_ssf > op->o_tls_ssf ) ?
-		op->o_sasl_ssf : op->o_tls_ssf;
+	op->o_ssf = ( op->o_sasl_ssf > op->o_tls_ssf )
+		?  op->o_sasl_ssf : op->o_tls_ssf;
 
 	/* get syncrepl cookie of shadow replica from subentry */
 	assert( si->si_rid < 1000 );