From: Howard Chu <hyc@openldap.org>
Date: Sat, 9 Apr 2011 23:55:00 +0000 (-0700)
Subject: ITS#6898 fix regression from ITS#6625
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b463b59ec922f5b7682f4ee98c4bc96f5123bd3;p=thirdparty%2Fopenldap.git

ITS#6898 fix regression from ITS#6625

compound statements need brackets, duh.
---

diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index eec7c6df61..3d940972d6 100644
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -778,19 +778,22 @@ ldap_set_option(
 
 	default:
 #ifdef HAVE_TLS
-		if ( ldap_pvt_tls_set_option( ld, option, (void *)invalue ) == 0 )
+		if ( ldap_pvt_tls_set_option( ld, option, (void *)invalue ) == 0 ) {
 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
 			return ( LDAP_OPT_SUCCESS );
+		}
 #endif
 #ifdef HAVE_CYRUS_SASL
-		if ( ldap_int_sasl_set_option( ld, option, (void *)invalue ) == 0 )
+		if ( ldap_int_sasl_set_option( ld, option, (void *)invalue ) == 0 ) {
 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
 			return ( LDAP_OPT_SUCCESS );
+		}
 #endif
 #ifdef HAVE_GSSAPI
-		if ( ldap_int_gssapi_set_option( ld, option, (void *)invalue ) == 0 )
+		if ( ldap_int_gssapi_set_option( ld, option, (void *)invalue ) == 0 ) {
 			LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
 			return ( LDAP_OPT_SUCCESS );
+		}
 #endif
 		/* bad param */
 		break;	/* LDAP_OPT_ERROR */