From 59d42b576295d17b60378a8e863b235dc5922831 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Jun 25 2010 22:34:11 +0000
Subject: Fixed regression caused by tls accept patch

Updated autofs schema (#587722)
Openldap built with conectionless support (#587722)

---

diff --git a/autofs.schema b/autofs.schema
index d8af6f4..07e23b4 100644
--- a/autofs.schema
+++ b/autofs.schema
@@ -8,14 +8,14 @@
 
 # Attribute Type Definitions
 
-attributetype ( 1.3.6.1.1.1.1.25 NAME 'automountInformation'
+attributetype ( 1.3.6.1.4.1.2312.4.1.2 NAME 'automountInformation'
 	DESC 'Information used by the autofs automounter'
-	EQUALITY caseExactIA5Match
+	EQUALITY caseExactMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-objectclass ( 1.3.6.1.1.1.1.13 NAME 'automount' SUP top STRUCTURAL
+objectclass ( 1.3.6.1.4.1.2312.4.2.3 NAME 'automount' SUP top STRUCTURAL
 	DESC 'An entry in an automounter map'
-	MUST ( cn $ automountInformation )
+	MUST ( cn $ automountInformation $ objectclass )
 	MAY ( description ) )
 
 objectclass ( 1.3.6.1.4.1.2312.4.2.2 NAME 'automountMap' SUP top STRUCTURAL
diff --git a/openldap-2.4.19-tls-accept.patch b/openldap-2.4.19-tls-accept.patch
index d7484b7..137d86d 100644
--- a/openldap-2.4.19-tls-accept.patch
+++ b/openldap-2.4.19-tls-accept.patch
@@ -4,8 +4,8 @@
  			    c->c_connid, (int) s, c->c_tls_ssf, c->c_ssf, 0 );
  			slap_sasl_external( c, c->c_tls_ssf, &authid );
  			if ( authid.bv_val ) free( authid.bv_val );
-+		} else if ( rc == 1 ) { /* need to retry */
-+			slapd_set_read( s, 0 );
++		} else if ( rc == 1 && ber_sockbuf_ctrl( c->c_sb,
++			LBER_SB_OPT_NEEDS_WRITE, NULL )) {  /* need to retry */
 +			slapd_set_write( s, 1 );
 +			connection_return( c );
 +			return 0;
diff --git a/openldap.spec b/openldap.spec
index 0607906..e82fe35 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -194,7 +194,7 @@ ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
 popd
 
 export CPPFLAGS="-I${dbdir}/include"
-export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC -D_GNU_SOURCE"
+export CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -DLDAP_CONNECTIONLESS -fPIC -D_GNU_SOURCE"
 export LDFLAGS="-L${dbdir}/%{_lib}"
 export LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 
@@ -635,6 +635,11 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Jun 25 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.19-5
+- fixed regression caused by tls accept patch
+- updated autofs schema (#587722)
+- openldap built with conectionless support (#587722)
+
 * Tue Mar 16 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.19-4
 - minor corrections of init script (#571235, #570057, #573804)