fix substring_comp_candidates logic if intersection of candidates

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index c80a605fbd3ffcd58ad41ded1a1908150e65a4d4..59ce22cdeabddeb812a12eae7602bdea3264a63c 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -53,8 +53,8 @@ do_modrdn(
        if( op->o_bind_in_progress ) {
                Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n",
                        0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS, NULL,
-                   "SASL bind in progress" );
+               send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS,
+                       NULL, "SASL bind in progress", NULL, NULL );
                return LDAP_SASL_BIND_IN_PROGRESS;
        }
 
@@ -161,8 +161,8 @@ do_modrdn(
                        free( newrdn );
                        free( newSuperior );
                        free( nnewSuperior );
-                       send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
-                                         default_referral );
+                       send_ldap_result( conn, op, LDAP_REFERRAL,
+                               NULL, NULL, default_referral, NULL );
                        return 0;
                }
        }
@@ -170,7 +170,7 @@ do_modrdn(
        dn_normalize_case( ndn );
 
        Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MODRDN dn=\"%s\"\n",
-           conn->c_connid, op->o_opid, ndn, 0, 0 );
+           op->o_connid, op->o_opid, ndn, 0, 0 );
 
        /*
         * We could be serving multiple database backends.  Select the
@@ -183,8 +183,8 @@ do_modrdn(
                free( newrdn ); 
                free( newSuperior );
                free( nnewSuperior );
-               send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-                   default_referral );
+               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                       NULL, NULL, default_referral, NULL );
                return rc;
        }
 
@@ -203,16 +203,12 @@ do_modrdn(
                free( nnewSuperior );
                
                send_ldap_result( conn, op, rc = LDAP_AFFECTS_MULTIPLE_DSAS,
-                                 NULL, "" );
+                       NULL, NULL, NULL, NULL );
            
                return rc;
 
        }
 
-
-       /* alias suffix if approp */
-       ndn = suffixAlias( ndn, op, be );
-
        /*
         * do the add if 1 && (2 || 3)
         * 1) there is an add function implemented in this backend;
@@ -231,12 +227,12 @@ do_modrdn(
                                    deloldrdn );
                        }
                } else {
-                       send_ldap_result( conn, op, rc = LDAP_PARTIAL_RESULTS, NULL,
-                           default_referral );
+                       send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+                               be->be_update_refs ? be->be_update_refs : default_referral, NULL );
                }
        } else {
-               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "Function not implemented" );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "Function not implemented", NULL, NULL );
        }
 
        free( ndn );