ITS#5912

diff --git a/CHANGES b/CHANGES
index 4bb30cc618ecceaae0cf27087bf8c28dd2dda0d8..37facb64de94b7cc806d5c1ca35c6c6d46f906c3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -32,6 +32,7 @@ OpenLDAP 2.4.14 Engineering
        Fixed slapd-bdb/hdb trickle task usage (ITS#5864)
        Fixed slapd-hdb idlcache with empty suffix (ITS#5859)
        Fixed slapd-ldap idassert-bind validity checking (ITS#5863)
+       Fixed slapd-ldap/meta RFC4525 increment support (ITS#5912)
        Fixed slapd-ldif numerous bugs (ITS#5408)
        Fixed slapd-ldif rename on same DN (ITS#5319)
        Fixed slapd-ldif deadlock (ITS#5329)

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 93df94c28ec7a02899d39e806e358ec83518c343..6c9979bd508e2781e2b8a763ca2847d95332628b 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -62,7 +62,10 @@ ldap_back_initialize( BackendInfo *bi )
                 * and the entryTtl attribute */
                SLAP_BFLAG_DYNAMIC |
 #endif /* LDAP_DYNAMIC_OBJECTS */
-               0;
+
+               /* back-ldap recognizes RFC4525 increment;
+                * let the remote server complain, if needed (ITS#5912) */
+               SLAP_BFLAG_INCREMENT;
 
        bi->bi_open = ldap_back_open;
        bi->bi_config = 0;

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 4d7d92195ecf6437e0e82e7d73ca2b43d31d9a59..ab9df5687be2730d564b0ce2830640fc8c7241b9 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -53,7 +53,10 @@ meta_back_initialize(
                SLAP_BFLAG_DYNAMIC |
 #endif /* LDAP_DYNAMIC_OBJECTS */
 #endif
-               0;
+
+               /* back-meta recognizes RFC4525 increment;
+                * let the remote server complain, if needed (ITS#5912) */
+               SLAP_BFLAG_INCREMENT;
 
        bi->bi_open = meta_back_open;
        bi->bi_config = 0;

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 115b4705ee9c8a9875c78b5a35629656a6e53467..7adc30469c34ceeb1d5b24b6cc94f7b0a05f3299 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -268,6 +268,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
        if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                        "modify/increment not supported in context" );
+               goto cleanup;
        }
 
        /*