Fix ITS#3424

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 908a4a841f1bc258326bd85ca54bd9b85509895c..f57f6cbb623e1b79b4462e82df1906c0939a973d 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -31,7 +31,6 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
@@ -260,20 +259,20 @@ fe_op_modify( Operation *op, SlapReply *rs )
                char abuf[BUFSIZ/2], *ptr = abuf;
                int len = 0;
 
-               Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD dn=\"%s\"\n",
-                       op->o_connid, op->o_opid, op->o_req_dn.bv_val, 0, 0 );
+               Statslog( LDAP_DEBUG_STATS, "%s MOD dn=\"%s\"\n",
+                       op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
 
                for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
                        if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
-                               Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
-                                   op->o_connid, op->o_opid, abuf, 0, 0 );
+                               Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
+                                   op->o_log_prefix, abuf, 0, 0, 0 );
 
-                       len = 0;
+                               len = 0;
                                ptr = abuf;
 
                                if( 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
-                                       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
-                                               op->o_connid, op->o_opid, tmp->sml_type.bv_val, 0, 0 );
+                                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
+                                               op->o_log_prefix, tmp->sml_type.bv_val, 0, 0, 0 );
                                        continue;
                                }
                        }
@@ -285,8 +284,8 @@ fe_op_modify( Operation *op, SlapReply *rs )
                        len += tmp->sml_type.bv_len;
                }
                if (len) {
-                       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu MOD attr=%s\n",
-                               op->o_connid, op->o_opid, abuf, 0, 0 );
+                       Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
+                               op->o_log_prefix, abuf, 0, 0, 0 );
                }
        }
 #endif /* LDAP_DEBUG */
@@ -298,7 +297,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
@@ -427,7 +426,7 @@ fe_op_modify( Operation *op, SlapReply *rs )
                                }
 
                                rs->sr_err = slap_mods_opattrs( op, modlist, modtail,
-                                       &rs->sr_text, textbuf, textlen );
+                                       &rs->sr_text, textbuf, textlen, 1 );
                                if( rs->sr_err != LDAP_SUCCESS ) {
                                        send_ldap_result( op, rs );
                                        goto cleanup;
@@ -755,7 +754,8 @@ int slap_mods_opattrs(
        Modifications *mods,
        Modifications **modtail,
        const char **text,
-       char *textbuf, size_t textlen )
+       char *textbuf, size_t textlen,
+       int manage_ctxcsn )
 {
        struct berval name, timestamp, csn;
        struct berval nname;
@@ -784,7 +784,7 @@ int slap_mods_opattrs(
 #endif /* HAVE_GMTIME_R */
                lutil_gentime( timebuf, sizeof(timebuf), ltm );
 
-               slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
+               slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, manage_ctxcsn );
 
 #ifndef HAVE_GMTIME_R
                ldap_pvt_thread_mutex_unlock( &gmtime_mutex );