list permissive in supported controls (ITS#3453)

diff --git a/CHANGES b/CHANGES
index 48a2bb0b252bb3faa2ca508948b503247c238da1..92b838441212c716aebedd8fb5031c5c26fe14f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.2.20 Engineering
        Fixed slapd sl_realloc memory overrun (ITS#3420, #3404, #3296)
        Fixed slapd syncrepl bugs (ITS#3423, #3425, #3443, #3448)
        Fixed back-bdb locks in backend_group (ITS#3263, #3365)
+       Fixed back-bdb/back-hdb listing of permissive control (ITS#3453)
        Fixed back-ldap failed connection retry (ITS#3217)
        Fixed back-sql segfault when logging and delete_rule is NULL (ITS#3407)
        Build Environment

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 13310a3e2f8819e6ec42c4d508a07d0f334f0ac6..153fe51ee13a98339c950d6e03afc6ea642111a2 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -569,6 +569,9 @@ bdb_initialize(
                LDAP_CONTROL_SUBENTRIES,
 #endif
                LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#endif
                NULL
        };
 

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index eb5a5afc58d690c58752b8273d3b0c686e636d4c..50e96303d12763166f4d136a7c58862f393497ce 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -47,6 +47,9 @@ ldbm_back_initialize(
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
                LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#endif
                NULL
        };