From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 6 Oct 2006 02:01:06 +0000 (+0000)
Subject: ITS#4695 fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_3_28~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=85ce75385b5c716027d6d8aac25905637d84d701;p=openldap

ITS#4695 fixes
---

diff --git a/CHANGES b/CHANGES
index cd65006ceb..60a4986c0d 100644
--- 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 901e65433c..cd989343e4 100644
--- 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 = &nsup;
+		} 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 );