From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 4 Sep 2008 22:12:52 +0000 (+0000)
Subject: ITS#5682
X-Git-Tag: OPENLDAP_REL_ENG_2_4_12~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a7dba8ea0483e1a1f51dd74d587131538e0c81b1;p=openldap

ITS#5682
---

diff --git a/CHANGES b/CHANGES
index 216c7a6391..08023395e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.12 Engineering
 	Fixed slapd firstComponentMatch normalization (ITS#5634)
 	Added slapd caseIgnoreListMatch (ITS#5608)
 	Fixed slapd objectClass canonicalization (ITS#5681)
+	Fixed slapd objectClass termination (ITS#5682)
 	Fixed slapd overlay control registration (ITS#5649)
 	Fixed slapd socket closing on Windows (ITS#5606)
 	Fixed slapd sortvals comparison (ITS#5578)
diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 7fa10b0177..508a3edcf3 100644
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -227,6 +227,7 @@ oc_bvfind_undef( struct berval *ocname )
 	oc->soc_cname.bv_len = ocname->bv_len;
 	oc->soc_cname.bv_val = (char *)&oc[ 1 ];
 	AC_MEMCPY( oc->soc_cname.bv_val, ocname->bv_val, ocname->bv_len );
+	oc->soc_cname.bv_val[ oc->soc_cname.bv_len ] = '\0';
 
 	/* canonical to upper case */
 	ldap_pvt_str2upper( oc->soc_cname.bv_val );