More Opheader fixes

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index a39abcb29a4c967bd65232588e57e7a0d435735a..d848e7a6cc2e4f7491bea1daf914d253899cc744 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -202,7 +202,7 @@ int passwd_extop(
                rs->sr_err = LDAP_OTHER;
 
        } else {
-               op2.o_hdr = op->o_hdr;
+               op2 = *op;
                op2.o_tag = LDAP_REQ_MODIFY;
                op2.o_callback = &cb2;
                op2.orm_modlist = qpw->rs_mods;

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 39fa95eaecda42e23ba33b01a6fb9c0b8d8aeba5..52e5d791698a4f2d925d503ee8ce43b9af290236 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -80,7 +80,9 @@ Filter *
 str2filter( const char *str )
 {
        Operation op = {0};
+       Opheader ohdr = {0};
 
+       op.o_hdr = &ohdr;
        op.o_tmpmemctx = NULL;
        op.o_tmpmfuncs = &ch_mfuncs;