slapi fixes

diff --git a/CHANGES b/CHANGES
index bfeaed2d6e4d12b7653ad56004e2df0a4f9f4894..7b29b2bea4007d8959408454f2d746d2865eb023 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,16 @@
 OpenLDAP 2.2 Change Log
 
-OpenLDAP 2.2.24 Engineering
+OpenLDAP 2.2.24 Release
        Fixed slapd "chldren:" typo (ITS#3560)
        Fixed slapd syncrepl consumer unclean shutdown (ITS#3546)
        Fixed slapd syncrepl provider sessionlog (ITS#3571)
        Fixed slapd connection_abandon processing (ITS#3534, 3546, 3571)
        Fixed slapd callback cleanup processing (ITS#3596)
-       FIxed slapd default password hash to use SSHA (ITS#3557)
+       Fixed slapd default password hash to use SSHA (ITS#3557)
        Fixed slap tool log initialization (ITS#3579)
+       Fixed slapi modify/increment support (ITS#3522)
+       Fixed slapi plugins called multiple times with glue (ITS#3529)
+       Fixed slapi 64-bit portability (ITS#3556)
        Fixed back-bdb IDL cache crash (ITS#3527)
        Fixed back-bdb initialization message (ITS#3533)
        Fixed back-hdb dn2id crash (ITS#3559)

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 13cb5ccd1e3b249a25f374ed1a53f4f786df3ef8..0a6203826fe0f4e354cb77390c3b8556f02db53b 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -618,7 +618,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
         * should just set SLAPI_RESULT_CODE rather than sending a
         * result if they wish to change the result.
         */
-       if ( op->o_pb != NULL ) {
+       if ( op->o_callback == NULL && op->o_pb != NULL ) {
                slapi_int_pblock_set_operation( op->o_pb, op );
                slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE,
                        (void *)rs->sr_err );