rpms/openldap/F-9 openldap-2.4.9-evolution-crash.patch, NONE, 1.1 openldap.spec, 1.122, 1.123
Jan Šafránek (jsafrane)
fedora-extras-commits at redhat.com
Fri Jun 6 08:14:11 UTC 2008
Author: jsafrane
Update of /cvs/pkgs/rpms/openldap/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29963
Modified Files:
openldap.spec
Added Files:
openldap-2.4.9-evolution-crash.patch
Log Message:
fix a crash
Resolves: #450017
openldap-2.4.9-evolution-crash.patch:
--- NEW FILE openldap-2.4.9-evolution-crash.patch ---
450017: evolution crashes
Source: upstream, ITS#5518
Reviewed-By: Jan Safranek <jsafrane at redhat.com>
Index: request.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap/request.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- openldap-upstream/libraries/libldap/request.c 7 Jan 2008 23:20:04 -0000 1.154
+++ openldap-upstream/libraries/libldap/request.c 23 May 2008 07:53:42 -0000 1.155
@@ -631,6 +631,9 @@
} else {
prevlc->lconn_next = tmplc->lconn_next;
}
+ if ( ld->ld_defconn == lc ) {
+ ld->ld_defconn = NULL;
+ }
break;
}
prevlc = tmplc;
@@ -675,6 +678,8 @@
if ( lc->lconn_sb != ld->ld_sb ) {
ber_sockbuf_free( lc->lconn_sb );
+ } else {
+ ber_int_sb_close( lc->lconn_sb );
}
if ( lc->lconn_rebind_queue != NULL) {
Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/F-9/openldap.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- openldap.spec 28 May 2008 12:19:16 -0000 1.122
+++ openldap.spec 6 Jun 2008 08:13:25 -0000 1.123
@@ -8,7 +8,7 @@
Summary: The configuration files, libraries, and documentation for OpenLDAP
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
@@ -32,6 +32,7 @@
Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
Patch9: openldap-2.3.37-smbk5pwd.patch
Patch10: openldap-2.4.6-multilib.patch
+Patch11: openldap-2.4.9-evolution-crash.patch
# Patches for the evolution library
Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -132,6 +133,7 @@
%patch6 -p1 -b .gethostbyname_r
%patch9 -p1 -b .smbk5pwd
%patch10 -p1 -b .multilib
+%patch11 -p1 -b .evolution-crash
cp %{_datadir}/libtool/config.{sub,guess} build/
popd
@@ -561,6 +563,9 @@
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Fri Jun 6 2008 Jan Safranek <jsafranek at redhat.com> 2.4.8-5
+- fix a crash (#450017)
+
* Wed May 28 2008 Jan Safranek <jsafranek at redhat.com> 2.4.8-4
- use /sbin/nologin as shell of ldap user (#447919)
More information about the scm-commits
mailing list