More Operation/Opheader fixes

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 54e0959407c2f21044aafb529a35e3f81891a38d..6093bb95b40cc40b2b59b16ea1fa78bed3bcaf2b 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -199,7 +199,9 @@ Entry* bdb_tool_entry_get( BackendDB *be, ID id )
        {
                EntryInfo *ei = NULL;
                Operation op = {0};
+               Opheader ohdr = {0};
 
+               op.o_hdr = &ohdr;
                op.o_bd = be;
                op.o_tmpmemctx = NULL;
                op.o_tmpmfuncs = &ch_mfuncs;
@@ -302,6 +304,7 @@ ID bdb_tool_entry_put(
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        DB_TXN *tid = NULL;
        Operation op = {0};
+       Opheader ohdr = {0};
 
        assert( be != NULL );
        assert( slapMode & SLAP_TOOL_MODE );
@@ -325,6 +328,7 @@ ID bdb_tool_entry_put(
                return NOID;
        }
 
+       op.o_hdr = &ohdr;
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;
@@ -395,6 +399,7 @@ int bdb_tool_entry_reindex(
        Entry *e;
        DB_TXN *tid = NULL;
        Operation op = {0};
+       Opheader ohdr = {0};
 
        Debug( LDAP_DEBUG_ARGS,
                "=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld )\n",
@@ -444,6 +449,7 @@ int bdb_tool_entry_reindex(
                "=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld, \"%s\" )\n",
                (long) id, e->e_dn, 0 );
 
+       op.o_hdr = &ohdr;
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;
@@ -495,6 +501,7 @@ ID bdb_tool_entry_modify(
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        DB_TXN *tid = NULL;
        Operation op = {0};
+       Opheader ohdr = {0};
 
        assert( be != NULL );
        assert( slapMode & SLAP_TOOL_MODE );
@@ -522,6 +529,7 @@ ID bdb_tool_entry_modify(
                return NOID;
        }
 
+       op.o_hdr = &ohdr;
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;

diff --git a/servers/slapd/back-ldbm/tools.c b/servers/slapd/back-ldbm/tools.c
index 2f0b42c83029b4f7ac816954dfa7f0f44645f712..e9e9621af749d964cfebda53421d454bd62fe310 100644 (file)
--- a/servers/slapd/back-ldbm/tools.c
+++ b/servers/slapd/back-ldbm/tools.c
@@ -178,6 +178,7 @@ ID ldbm_tool_entry_put(
        int rc, len;
        ID id;
        Operation op = {0};
+       Opheader ohdr = {0};
 
        assert( slapMode & SLAP_TOOL_MODE );
        assert( id2entry != NULL );
@@ -210,6 +211,7 @@ ID ldbm_tool_entry_put(
                return NOID;
        }
 
+       op.o_hdr = &ohdr;
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;
@@ -259,6 +261,7 @@ int ldbm_tool_entry_reindex(
        int rc;
        Entry *e;
        Operation op = {0};
+       Opheader ohdr = {0};
 
        Debug( LDAP_DEBUG_ARGS, "=> ldbm_tool_entry_reindex( %ld )\n",
                (long) id, 0, 0 );
@@ -286,6 +289,7 @@ int ldbm_tool_entry_reindex(
 
        dn2id_add( be, &e->e_nname, e->e_id );
 
+       op.o_hdr = &ohdr;
        op.o_bd = be;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;