ITS#6474

diff --git a/CHANGES b/CHANGES
index 9f0700416cef68568ba193700c1bba2b7a94c286..fb8561152b01260191aa3901b02aebc62f62034c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ OpenLDAP 2.4.23 Engineering
        Fixed slapd syncrepl rid logging (ITS#6533)
        Fixed slapd modrdn handling of invalid values (ITS#6570)
        Fixed slapd-bdb hasSubordinates computation (ITS#6549)
+       Fixed slapd-bdb to use memcpy instead for strcpy (ITS#6474)
        Fixed slapo-ppolicy to use Debug (ITS#6566)
        Fixed slapo-rwm to use Debug (ITS#6566)
        Fixed slapo-sssvlv to use Debug (ITS#6566)

diff --git a/servers/slapd/back-bdb/dn2id.c b/servers/slapd/back-bdb/dn2id.c
index a8e5163817d606f9a8dcecc43cab81619f102bdb..6e89e61db5c86f53880999c08c004102478f2f8c 100644 (file)
--- a/servers/slapd/back-bdb/dn2id.c
+++ b/servers/slapd/back-bdb/dn2id.c
@@ -680,7 +680,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 );