ITS#5785

diff --git a/CHANGES b/CHANGES
index b34a5062544c87a33dcda5398188a0b611b2a026..32d03680e72ceef948954e541fca0abe7ee9144d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.4.13 Engineering
        Added slapd keyword add_content_acl for add checks (ITS#4556,ITS#5723)
        Fixed slapd config backend olcLogFile support (ITS#5765)
        Fixed slapd contextCSN pending list (ITS#5709)
+       Fixed slapd control criticality (ITS#5785)
        Added slapd dn.this search limits (ITS#5734)
        Fixed slapd nameUIDPretty bitstring parsing (ITS#5750)
        Fixed slapd overlay/database open with real structure (ITS#5724)

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 496524f10a87961bd74732a2ce5c455224551813..ee2a36742f91aca599ebb4f9e732a257f23d11c5 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -960,12 +960,10 @@ static int parseDontUseCopy (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( !ctrl->ldctl_iscritical ) {
-               rs->sr_text = "dontUseCopy criticality of FALSE not allowed";
-               return LDAP_PROTOCOL_ERROR;
-       }
+       op->o_dontUseCopy = ctrl->ldctl_iscritical
+               ? SLAP_CONTROL_CRITICAL
+               : SLAP_CONTROL_NONCRITICAL;
 
-       op->o_dontUseCopy = SLAP_CONTROL_CRITICAL;
        return LDAP_SUCCESS;
 }