From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 3 Sep 2008 20:00:12 +0000 (+0000)
Subject: ITS#5670
X-Git-Tag: OPENLDAP_REL_ENG_2_4_12~82
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5060c2fa7a228768f764d1aa3f59ff7738217990;p=openldap

ITS#5670
---

diff --git a/CHANGES b/CHANGES
index 188d8fda1f..36fff5855b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ OpenLDAP 2.4.12 Engineering
 	Documentation
 		Added slapd-ldap(5), slapd-meta(5) noundeffilter (ITS#5614)
 		admin24 guide updates (ITS#5616)
+		admin24 octetString fix (ITS#5670)
 
 OpenLDAP 2.4.11 Release (2008/07/16)
 	Fixed liblber ber_get_next length decoding (ITS#5580)
diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index 69939d9070..de69b610a9 100644
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1383,7 +1383,7 @@ SSHA
 mandir
 RXER
 SSFs
-octetStringOrderingStringMatch
+octetStringOrderingMatch
 auditCompare
 pEntry
 strongAuthNotSupported
@@ -1657,7 +1657,7 @@ BCP
 baz
 params
 generalizedTimeOrderingMatch
-octetStringSubstringsStringMatch
+octetStringSubstringsMatch
 ber
 slimit
 ali
diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e1d45b36bc..c5a0140c7d 100644
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -260,8 +260,8 @@ numericStringMatch			equality	numerical
 numericStringOrderingMatch		ordering	numerical
 numericStringSubstringsMatch		substrings	numerical
 octetStringMatch			equality	octet string
-octetStringOrderingStringMatch		ordering	octet string
-octetStringSubstringsStringMatch	ordering	octet string
+octetStringOrderingMatch		ordering	octet string
+octetStringSubstringsMatch	ordering	octet string
 objectIdentiferMatch			equality	object identifier
 !endblock