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
This commit is contained in:
Ralf Haferkamp 2010-02-16 09:14:35 +00:00 committed by Git OBS Bridge
parent 57eba7825e
commit c9b485ddb1
3 changed files with 7 additions and 7 deletions

View File

@ -56,9 +56,9 @@ Patch1: openldap2.dif
Patch2: slapd_conf.dif Patch2: slapd_conf.dif
Patch3: ldap_conf.dif Patch3: ldap_conf.dif
Patch4: ldapi_url.dif Patch4: ldapi_url.dif
Patch5: slapd-back-hdb-fortify.dif
Patch6: libldap-gethostbyname_r.dif Patch6: libldap-gethostbyname_r.dif
Patch7: pie-compile.dif Patch7: pie-compile.dif
Patch8: openldap-2.4.21.dif
Patch11: slapd-bconfig-del-db.dif Patch11: slapd-bconfig-del-db.dif
Patch100: openldap-2.3.37.dif Patch100: openldap-2.3.37.dif
Patch200: slapd_getaddrinfo_dupl.dif Patch200: slapd_getaddrinfo_dupl.dif
@ -175,11 +175,11 @@ Authors:
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch5
%patch6 %patch6
%if %suse_version > 920 %if %suse_version > 920
%patch7 %patch7
%endif %endif
%patch8
%patch11 %patch11
%if %suse_version == 1100 %if %suse_version == 1100
%patch200 -p1 %patch200 -p1

View File

@ -56,9 +56,9 @@ Patch1: openldap2.dif
Patch2: slapd_conf.dif Patch2: slapd_conf.dif
Patch3: ldap_conf.dif Patch3: ldap_conf.dif
Patch4: ldapi_url.dif Patch4: ldapi_url.dif
Patch5: slapd-back-hdb-fortify.dif
Patch6: libldap-gethostbyname_r.dif Patch6: libldap-gethostbyname_r.dif
Patch7: pie-compile.dif Patch7: pie-compile.dif
Patch8: openldap-2.4.21.dif
Patch11: slapd-bconfig-del-db.dif Patch11: slapd-bconfig-del-db.dif
Patch100: openldap-2.3.37.dif Patch100: openldap-2.3.37.dif
Patch200: slapd_getaddrinfo_dupl.dif Patch200: slapd_getaddrinfo_dupl.dif
@ -175,11 +175,11 @@ Authors:
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch5
%patch6 %patch6
%if %suse_version > 920 %if %suse_version > 920
%patch7 %patch7
%endif %endif
%patch8
%patch11 %patch11
%if %suse_version == 1100 %if %suse_version == 1100
%patch200 -p1 %patch200 -p1

View File

@ -1,13 +1,13 @@
Index: servers/slapd/back-bdb/dn2id.c 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.orig
+++ servers/slapd/back-bdb/dn2id.c 2010-02-13 22:39:18.000000000 +0100 +++ servers/slapd/back-bdb/dn2id.c
@@ -676,7 +676,7 @@ hdb_dn2id_delete( @@ -676,7 +676,7 @@ hdb_dn2id_delete(
d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80; d->nrdnlen[0] = (BEI(e)->bei_nrdn.bv_len >> 8) | 0x80;
dlen[0] = d->nrdnlen[0]; dlen[0] = d->nrdnlen[0];
dlen[1] = d->nrdnlen[1]; dlen[1] = d->nrdnlen[1];
- strcpy( d->nrdn, BEI(e)->bei_nrdn.bv_val ); - 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; data.data = d;
rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags ); rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );