rpms/openldap/devel openldap-2.4.21-dn2id-segfault.patch, NONE, 1.1 openldap.spec, 1.158, 1.159 openldap-2.4.19-tls-accept.patch, 1.1, NONE

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28997

Modified Files:
	openldap.spec 
Added Files:
	openldap-2.4.21-dn2id-segfault.patch 
Removed Files:
	openldap-2.4.19-tls-accept.patch 
Log Message:
fixed SIGSEGV when deleting data using hdb (#562227)

openldap-2.4.21-dn2id-segfault.patch:
 dn2id.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openldap-2.4.21-dn2id-segfault.patch ---
--- openldap-2.4.19/servers/slapd/back-bdb/dn2id.c.orig	2010-02-24 09:55:39.000000000 +0100
+++ openldap-2.4.19/servers/slapd/back-bdb/dn2id.c	2010-02-24 09:56:07.000000000 +0100
@@ -676,7 +676,7 @@ hdb_dn2id_delete(
 	d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80;
 	dlen[0] = d->nrdnlen[0];
 	dlen[1] = d->nrdnlen[1];
-	strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val );
+	memcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val, BEI(e)->bei_nrdn.bv_len+1 );
 	data.data = d;
 
 	rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- openldap.spec	1 Feb 2010 11:13:07 -0000	1.158
+++ openldap.spec	24 Feb 2010 09:15:05 -0000	1.159
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -35,6 +35,7 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
 Patch11: openldap-2.4.16-doc-cacertdir.patch
+Patch12: openldap-2.4.21-dn2id-segfault.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -130,6 +131,7 @@ pushd openldap-%{version}
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
 %patch11 -p1 -b .cacertdir
+%patch12 -p1 -b .segfault
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 popd
@@ -629,6 +631,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Wed Feb 24 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-4
+- fixed SIGSEGV when deleting data using hdb (#562227)
+
 * Mon Feb 01 2010 Jan Zeleny <jzeleny at redhat.com> - 2.4.21-3
 - fixed broken link /usr/sbin/slapschema (#559873)
 


--- openldap-2.4.19-tls-accept.patch DELETED ---