ITS#5895

diff --git a/CHANGES b/CHANGES
index b6dae9e2dd52662b5c73b5fb257469537d9614a9..2bb9ca2e25d358b0394a601ac05ed74fff1229d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ OpenLDAP 2.4.14 Engineering
                Fixed MSVC 9.0 build issues (ITS#5888)
        Documentation
                admin24 added limits chapter (ITS#5818)
+               slapo-constraint(5) example fix (ITS#5895)
 
 OpenLDAP 2.4.13 Release (2008/11/24)
        Added libldap dereference control support (ITS#5768)

diff --git a/doc/guide/admin/overlays.sdf b/doc/guide/admin/overlays.sdf
index cc1773c1e49e476ce19b2dde4675e9c2bd4cbc66..e3c55936b22a7de5d830ca44e1a31d6fe9c887d1 100644 (file)
--- a/doc/guide/admin/overlays.sdf
+++ b/doc/guide/admin/overlays.sdf
@@ -357,7 +357,7 @@ H3: Constraint Configuration
 Configuration via {{slapd.conf}}(5) would look like:
 
 >        overlay constraint
->        constraint_attribute mail regex ^[:alnum:]+@mydomain.com$
+>        constraint_attribute mail regex ^[[:alnum:]]+@mydomain.com$
 >        constraint_attribute title uri
 >        ldap:///dc=catalog,dc=example,dc=com?title?sub?(objectClass=titleCatalog)
 
@@ -374,7 +374,7 @@ An example for use with {{cn=config}}:
 >       objectClass: olcOverlayConfig
 >       objectClass: olcConstraintConfig
 >       olcOverlay: constraint
->       olcConstraintAttribute: mail regex ^[:alnum:]+@mydomain.com$
+>       olcConstraintAttribute: mail regex ^[[:alnum:]]+@mydomain.com$
 >       olcConstraintAttribute: title uri ldap:///dc=catalog,dc=example,dc=com?title?sub?(objectClass=titleCatalog)
 
 

diff --git a/doc/man/man5/slapo-constraint.5 b/doc/man/man5/slapo-constraint.5
index af832ac4ce9bc26d43f00e25b8ead02279f7fe11..30413be9b8a261d37219b8e5035f740719f818f5 100644 (file)
--- a/doc/man/man5/slapo-constraint.5
+++ b/doc/man/man5/slapo-constraint.5
@@ -103,7 +103,7 @@ LDAP_CONSTRAINT_VIOLATION error.
 overlay constraint
 constraint_attribute jpegPhoto size 131072
 constraint_attribute userPassword count 3
-constraint_attribute mail regex ^[:alnum:]+@mydomain.com$
+constraint_attribute mail regex ^[[:alnum:]]+@mydomain.com$
 constraint_attribute title uri
   ldap:///dc=catalog,dc=example,dc=com?title?sub?(objectClass=titleCatalog)
 constraint_attribute cn,sn,givenName set