1
0
forked from pool/openldap2

Accepting request 32670 from network:ldap

Copy from network:ldap/openldap2 based on submit request 32670 from user rhafer

OBS-URL: https://build.opensuse.org/request/show/32670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=59
This commit is contained in:
OBS User autobuild 2010-02-18 15:46:12 +00:00 committed by Git OBS Bridge
commit 2d7d554a0a
5 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
- Add fix for stricter fortification checks of GCC 4.5.
-------------------------------------------------------------------
Thu Jan 7 15:47:20 UTC 2010 - rhafer@novell.com

View File

@ -28,7 +28,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de
BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
%endif
Version: 2.4.21
Release: 1
Release: 2
Url: http://www.openldap.org
License: BSD3c(or similar) ; openldap 2.8
%if "%{name}" == "openldap2"
@ -56,6 +56,7 @@ 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
Patch11: slapd-bconfig-del-db.dif
@ -174,6 +175,7 @@ Authors:
%patch2
%patch3
%patch4
%patch5
%patch6
%if %suse_version > 920
%patch7

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
- Add fix for stricter fortification checks of GCC 4.5.
-------------------------------------------------------------------
Thu Jan 7 15:47:20 UTC 2010 - rhafer@novell.com

View File

@ -28,7 +28,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-de
BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
%endif
Version: 2.4.21
Release: 1
Release: 2
Url: http://www.openldap.org
License: BSD3c(or similar) ; openldap 2.8
%if "%{name}" == "openldap2"
@ -56,6 +56,7 @@ 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
Patch11: slapd-bconfig-del-db.dif
@ -174,6 +175,7 @@ Authors:
%patch2
%patch3
%patch4
%patch5
%patch6
%if %suse_version > 920
%patch7

View File

@ -0,0 +1,13 @@
Index: servers/slapd/back-bdb/dn2id.c
===================================================================
--- 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, BEI(e)->bei_nrdn.bv_len + 1);
data.data = d;
rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );