[openldap/f15] fix: cannot set SASL or GSSAPI options

[jvcelak]

commit 2e513b074923fbbe0b70bcd7f7e7c329e82ca1af
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Wed Aug 24 20:12:34 2011 +0200

    fix: cannot set SASL or GSSAPI options
    
    Resolves: #733056

 openldap-sasl-gssapi-options.patch |   46 ++++++++++++++++++++++++++++++++++++
 openldap.spec                      |    3 ++
 2 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/openldap-sasl-gssapi-options.patch b/openldap-sasl-gssapi-options.patch
new file mode 100644
index 0000000..1ac5500
--- /dev/null
+++ b/openldap-sasl-gssapi-options.patch
@@ -0,0 +1,46 @@
+Cannot set SASL or GSSAPI options
+
+Regression, compound statements need brackets.
+
+Author: Howard Chu <hyc at openldap.org>
+Upstream ITS: #6898
+Upstream commit: 9b463b5
+Resolves: #733056
+
+---
+ libraries/libldap/options.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
+index eec7c6d..3d94097 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 */
+-- 
+1.7.6
+
diff --git a/openldap.spec b/openldap.spec
index 1eb016c..8ca3ad8 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -45,6 +45,7 @@ Patch22: openldap-dds-overlay-tolerance.patch
 Patch23: openldap-man-slapo-unique.patch
 Patch24: openldap-nss-wildcards.patch
 Patch25: openldap-man-ldap-sync.patch
+Patch26: openldap-sasl-gssapi-options.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -162,6 +163,7 @@ pushd openldap-%{version}
 %patch23 -p1 -b .man-slapo-unique
 %patch24 -p1 -b .nss-wildcards
 %patch25 -p1 -b .man-ldap-sync
+%patch26 -p1 -b .sasl-gssapi-options
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -713,6 +715,7 @@ exit 0
 - manpage fix: errors in manual page slapo-unique (#733070)
 - fix: matching wildcard hostnames in certificate Subject field does not work (#733073)
 - manpage fix: wrong ldap_sync_destroy() prototype in ldap_sync(3) manpage (#717722)
+- fix: cannot set SASL or GSSAPI options (#733056)
 
 * Tue Jun 28 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.24-3
 - fix: openldap-servers scriptlets require initscripts package (#716857)