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 329190f930811bd25a6e8e523f5ad1636e9cffe0..59ce22cdeabddeb812a12eae7602bdea3264a63c 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -50,6 +50,14 @@ do_modrdn(
 
        Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
 
+       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", NULL, NULL );
+               return LDAP_SASL_BIND_IN_PROGRESS;
+       }
+
        /*
         * Parse the modrdn request.  It looks like this:
         *
@@ -64,8 +72,9 @@ do_modrdn(
        if ( ber_scanf( op->o_ber, "{aab", &ndn, &newrdn, &deloldrdn )
            == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL, "" );
-               return rc;
+               send_ldap_disconnect( conn, op,
+                       LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
        }
 
        /* Check for newSuperior parameter, if present scan it */
@@ -88,9 +97,9 @@ do_modrdn(
                        Debug( LDAP_DEBUG_ANY,
                               "modrdn(v2): invalid field newSuperior!\n",
                               0, 0, 0 );
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-                                         NULL, "" );
-                       return rc;
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" );
+                       return -1;
                }
 
                if ( ber_scanf( op->o_ber, "a", &newSuperior ) 
@@ -98,9 +107,9 @@ do_modrdn(
 
                    Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\"}) failed\n",
                           0, 0, 0 );
-                   send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                                     "" );
-                   return rc;
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "decoding error" );
+                   return -1;
 
                }
 
@@ -116,12 +125,11 @@ do_modrdn(
                free( newrdn ); 
                free( newSuperior );
                Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                   "decoding error" );
-               return rc;
+               send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "decoding error" );
+               return -1;
        }
 
-#ifdef  GET_CTRLS
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
                free( ndn );
                free( newrdn ); 
@@ -129,7 +137,6 @@ do_modrdn(
                Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
                return rc;
        } 
-#endif
 
        if( newSuperior != NULL ) {
                /* GET BACKEND FOR NEW SUPERIOR */
@@ -154,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;
                }
        }
@@ -163,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
@@ -176,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;
        }
 
@@ -196,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;
@@ -224,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 );