From c9b485ddb118057a44a2c66d44e6e965f27174160c7a26d1b4ba5bcace3ee479 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Tue, 16 Feb 2010 09:14:35 +0000
Subject: [PATCH] slightly reworked gcc 4.5 fortify patch (and renamed it)

OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=30
---
 openldap2-client.spec                             | 4 ++--
 openldap2.spec                                    | 4 ++--
 openldap-2.4.21.dif => slapd-back-hdb-fortify.dif | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename openldap-2.4.21.dif => slapd-back-hdb-fortify.dif (62%)

diff --git a/openldap2-client.spec b/openldap2-client.spec
index 65f155b..792bf96 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -56,9 +56,9 @@ Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
+Patch5:		slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
-Patch8:		openldap-2.4.21.dif
 Patch11:        slapd-bconfig-del-db.dif
 Patch100:       openldap-2.3.37.dif
 Patch200:       slapd_getaddrinfo_dupl.dif
@@ -175,11 +175,11 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 %patch6
 %if %suse_version > 920
 %patch7
 %endif
-%patch8
 %patch11
 %if %suse_version == 1100
 %patch200 -p1
diff --git a/openldap2.spec b/openldap2.spec
index 67558d0..c2dfffd 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -56,9 +56,9 @@ Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
 Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
+Patch5:		slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
 Patch7:         pie-compile.dif
-Patch8:		openldap-2.4.21.dif
 Patch11:        slapd-bconfig-del-db.dif
 Patch100:       openldap-2.3.37.dif
 Patch200:       slapd_getaddrinfo_dupl.dif
@@ -175,11 +175,11 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 %patch6
 %if %suse_version > 920
 %patch7
 %endif
-%patch8
 %patch11
 %if %suse_version == 1100
 %patch200 -p1
diff --git a/openldap-2.4.21.dif b/slapd-back-hdb-fortify.dif
similarity index 62%
rename from openldap-2.4.21.dif
rename to slapd-back-hdb-fortify.dif
index 3efdff4..6dcea6e 100644
--- a/openldap-2.4.21.dif
+++ b/slapd-back-hdb-fortify.dif
@@ -1,13 +1,13 @@
 Index: servers/slapd/back-bdb/dn2id.c
 ===================================================================
---- servers/slapd/back-bdb/dn2id.c.orig	2009-06-19 23:55:57.000000000 +0200
-+++ servers/slapd/back-bdb/dn2id.c	2010-02-13 22:39:18.000000000 +0100
+--- servers/slapd/back-bdb/dn2id.c.orig
++++ servers/slapd/back-bdb/dn2id.c
 @@ -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, strlen (BEI(e)->bei_nrdn.bv_val) + 1);
++	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 );