ITS#4695 fixes

diff --git a/CHANGES b/CHANGES
index cd65006ceb683755f89c2a461dd1e1048e4d7d79..60a4986c0dff8aa18ae626b40ad5d212f966c100 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ OpenLDAP 2.3.28 Engineering
        Fixed slapd setting c_sasl_bindop only on SASL binds
        Fixed slapd return code not being propagated (ITS#4565)
        Fixed slapd integerBitAndMatch (ITS#4672)
+       Fixed slapd syncrepl modrdn new superior (ITS#4695)
        Fixed slapd-ldap retry with idassert (ITS#4686)
        Fixed slapd-monitor locking with scope "subordinate" (ITS#4668)
        Fixed slapd-perl deletes (ITS#2612)

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 901e65433c107b16ade6b1cd16ea921864656cdc..cd989343e4eb50c848c92fa98ba4588e0e74c782 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1389,6 +1389,9 @@ syncrepl_message_to_op(
                                goto done;
                        op->orr_newSup = &psup;
                        op->orr_nnewSup = ⊅
+               } else {
+                       op->orr_newSup = NULL;
+                       op->orr_nnewSup = NULL;
                }
                op->orr_newrdn = prdn;
                op->orr_nnewrdn = nrdn;
@@ -1868,6 +1871,9 @@ retry_add:;
                                dnParent( &entry->e_name, &newp );
                                op->orr_newSup = &newp;
                                op->orr_nnewSup = &nnewp;
+                       } else {
+                               op->orr_newSup = NULL;
+                               op->orr_nnewSup = NULL;
                        }
                        op->orr_deleteoldrdn = 0;
                        rc = be->be_modrdn( op, &rs_modify );