From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 9 Oct 2001 18:42:23 +0000 (+0000)
Subject: ITS#1379 slurpd newsup fix
X-Git-Tag: OPENLDAP_REL_ENG_2_0_16~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf219d3fd312e538d8d5188e4164b30105e81218;p=thirdparty%2Fopenldap.git

ITS#1379 slurpd newsup fix
---

diff --git a/CHANGES b/CHANGES
index 8563dee646..65bb85ee59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.16 Engineering
 	Fixed slapd/slurpd maxargs bug (ITS#1343)
 	Fixed slapd ManageDSAIT warning
-	Fixed slurpd server down reject fix (ITS#1183)
+	Fixed slurpd server down reject bug (ITS#1183)
+	Fixed slurpd moddn newsup bug (ITS#1379)
 	Fixed -llber ber_realloc bug (ITS#1346)
 	Fixed -lldap multi-level referral chase bug (ITS#1346)
 	Fixed -lldap high port bug
diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 4e60debe6b..dccd2e92b7 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -422,7 +422,7 @@ op_ldap_modrdn(
 		return -1;
 		}
 
-		newrdn = mi[ i ].mi_val;
+		newsup = mi[ i ].mi_val;
 	    state |= GOT_NEWSUP;
 
 	} else {
@@ -459,7 +459,7 @@ op_ldap_modrdn(
 #endif /* LDAP_DEBUG */
 
     /* Do the modrdn */
-    rc = ldap_rename2_s( ri->ri_ldp, re->re_dn, mi->mi_val, newsup, drdnflag );
+    rc = ldap_rename2_s( ri->ri_ldp, re->re_dn, newrdn, newsup, drdnflag );
 
 	ldap_get_option( ri->ri_ldp, LDAP_OPT_ERROR_NUMBER, &lderr);
     return( lderr );