Jan Vcelak
parent
d1578e311f
commit
a40d05ac93
|
|
@ -1 +1 @@
|
|||
/openldap-2.4.24.tgz
|
||||
/openldap-2.4.25.tgz
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
fix: Possible null pointer dereference introduced when adding NSS full non-blocking semantics
|
||||
|
||||
Resolves: #684035 (RHEL)
|
||||
Upstream ITS: #6863
|
||||
|
||||
--- openldap-2.4.24.orig/libraries/libldap/tls_m.c
|
||||
+++ openldap-2.4.24/libraries/libldap/tls_m.c
|
||||
@@ -2272,7 +2272,7 @@
|
||||
}
|
||||
|
||||
if ( p->firsttag == LBER_SEQUENCE ) {
|
||||
- if ( *thebyte ) {
|
||||
+ if ( thebyte ) {
|
||||
*thebyte = p->firsttag;
|
||||
}
|
||||
return 1;
|
||||
@@ -2769,7 +2769,7 @@
|
||||
struct tls_data *p;
|
||||
p = tlsm_get_pvt_tls_data( fd );
|
||||
|
||||
- if ( !data ) {
|
||||
+ if ( p == NULL || data == NULL ) {
|
||||
return PR_FAILURE;
|
||||
}
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
fix: openldap-servers upgrade hangs
|
||||
|
||||
Resolves: #664433
|
||||
Upstream ITS: #6853
|
||||
|
||||
--- openldap-2.4.24.orig/servers/slapd/back-bdb/tools.c
|
||||
+++ openldap-2.4.24/servers/slapd/back-bdb/tools.c
|
||||
@@ -90,8 +90,10 @@
|
||||
#ifdef USE_TRICKLE
|
||||
static ldap_pvt_thread_mutex_t bdb_tool_trickle_mutex;
|
||||
static ldap_pvt_thread_cond_t bdb_tool_trickle_cond;
|
||||
+static ldap_pvt_thread_cond_t bdb_tool_trickle_cond_end;
|
||||
|
||||
static void * bdb_tool_trickle_task( void *ctx, void *ptr );
|
||||
+static int bdb_tool_trickle_active;
|
||||
#endif
|
||||
|
||||
static void * bdb_tool_index_task( void *ctx, void *ptr );
|
||||
@@ -127,6 +129,7 @@
|
||||
#ifdef USE_TRICKLE
|
||||
ldap_pvt_thread_mutex_init( &bdb_tool_trickle_mutex );
|
||||
ldap_pvt_thread_cond_init( &bdb_tool_trickle_cond );
|
||||
+ ldap_pvt_thread_cond_init( &bdb_tool_trickle_cond_end );
|
||||
ldap_pvt_thread_pool_submit( &connection_pool, bdb_tool_trickle_task, bdb->bi_dbenv );
|
||||
#endif
|
||||
|
||||
@@ -159,7 +162,16 @@
|
||||
slapd_shutdown = 1;
|
||||
#ifdef USE_TRICKLE
|
||||
ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex );
|
||||
+
|
||||
+ /* trickle thread may not have started yet */
|
||||
+ while ( !bdb_tool_trickle_active )
|
||||
+ ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond_end,
|
||||
+ &bdb_tool_trickle_mutex );
|
||||
+
|
||||
ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond );
|
||||
+ while ( bdb_tool_trickle_active )
|
||||
+ ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond_end,
|
||||
+ &bdb_tool_trickle_mutex );
|
||||
ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex );
|
||||
#endif
|
||||
ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex );
|
||||
@@ -1249,6 +1261,8 @@
|
||||
int wrote;
|
||||
|
||||
ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex );
|
||||
+ bdb_tool_trickle_active = 1;
|
||||
+ ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond_end );
|
||||
while ( 1 ) {
|
||||
ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond,
|
||||
&bdb_tool_trickle_mutex );
|
||||
@@ -1256,6 +1270,8 @@
|
||||
break;
|
||||
env->memp_trickle( env, 30, &wrote );
|
||||
}
|
||||
+ bdb_tool_trickle_active = 0;
|
||||
+ ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond_end );
|
||||
ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex );
|
||||
|
||||
return NULL;
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
%define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
|
||||
|
||||
Name: openldap
|
||||
Version: 2.4.24
|
||||
Release: 2%{?dist}
|
||||
Version: 2.4.25
|
||||
Release: 1%{?dist}
|
||||
Summary: LDAP support libraries
|
||||
Group: System Environment/Daemons
|
||||
License: OpenLDAP
|
||||
|
|
@ -29,8 +29,6 @@ Patch6: openldap-smbk5pwd-overlay.patch
|
|||
Patch7: openldap-ldaprc-currentdir.patch
|
||||
Patch8: openldap-userconfig-setgid.patch
|
||||
Patch9: openldap-nss-nofork.patch
|
||||
Patch10: openldap-nss-null-pointer.patch
|
||||
Patch11: openldap-slapadd-hang.patch
|
||||
|
||||
# patches for the evolution library (see README.evolution)
|
||||
Patch200: openldap-evolution-ntlm.patch
|
||||
|
|
@ -132,8 +130,6 @@ pushd openldap-%{version}
|
|||
%patch7 -p1 -b .ldaprc-currentdir
|
||||
%patch8 -p1 -b .userconfig-setgid
|
||||
%patch9 -p1 -b .nss-nofork
|
||||
%patch10 -p1 -b .nss-null-pointer
|
||||
%patch11 -p1 -b .slapadd-hang
|
||||
|
||||
cp %{_datadir}/libtool/config/config.{sub,guess} build/
|
||||
|
||||
|
|
@ -178,7 +174,7 @@ build() {
|
|||
--with-threads=posix \
|
||||
\
|
||||
--enable-local \
|
||||
--enable-rlookups \
|
||||
--enable-rlookups \
|
||||
\
|
||||
--with-tls=no \
|
||||
--with-cyrus-sasl \
|
||||
|
|
@ -675,6 +671,9 @@ exit 0
|
|||
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Mon Jun 27 2011 Jan Vcelak <jvcelak@redhat.com> 2.4.25-1
|
||||
- rebase to new upstream release
|
||||
|
||||
* Fri Mar 18 2011 Jan Vcelak <jvcelak@redhat.com> 2.4.24-2
|
||||
- new: system resource limiting for slapd using ulimit
|
||||
- fix update: openldap can't use TLS after a fork() (#636956)
|
||||
|
|
|
|||
Loading…
Reference in New Issue