ITS#1379 slurpd newsup fix

diff --git a/CHANGES b/CHANGES
index 8563dee646a28afb936f5d920da486ef23046625..65bb85ee59a153389daf9e1ede1c3365cfc1bf1f 100644 (file)
--- 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 4e60debe6b9b5e4af5993fc12533dafa363aeb65..dccd2e92b75b10350b7202af8da868719a3f3125 100644 (file)
--- 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 );