fix substring_comp_candidates logic if intersection of candidates

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 6be8038bdfd7257c6b749bb0ea539fc246a96e0a..016033742c4f869b2816773a770176d9460da009 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -45,8 +45,8 @@ do_modify(
        if( op->o_bind_in_progress ) {
                Debug( LDAP_DEBUG_ANY, "do_modify: 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;
        }
 
@@ -71,8 +71,9 @@ do_modify(
 
        if ( ber_scanf( op->o_ber, "{a" /*}*/, &ndn ) == 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;
        }
 
        Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", ndn, 0, 0 );
@@ -95,13 +96,13 @@ do_modify(
                    &(*modtail)->ml_type, &(*modtail)->ml_bvalues )
                    == LBER_ERROR )
                {
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                           "decoding error" );
+                       send_ldap_disconnect( conn, op,
+                               LDAP_PROTOCOL_ERROR, "decoding modlist error" );
                        free( ndn );
                        free( *modtail );
                        *modtail = NULL;
                        modlist_free( modlist );
-                       return rc;
+                       return -1;
                }
 
                (*modtail)->ml_op = mop;
@@ -110,21 +111,21 @@ do_modify(
                    (*modtail)->ml_op != LDAP_MOD_DELETE &&
                    (*modtail)->ml_op != LDAP_MOD_REPLACE )
                {
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                           "unrecognized modify operation" );
+                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+                           NULL, "unrecognized modify operation", NULL, NULL );
                        free( ndn );
                        modlist_free( modlist );
-                       return rc;
+                       return LDAP_PROTOCOL_ERROR;
                }
 
                if ( (*modtail)->ml_bvalues == NULL
                        && (*modtail)->ml_op != LDAP_MOD_DELETE )
                {
-                       send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR, NULL,
-                           "no values given" );
+                       send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+                           NULL, "unrecognized modify operation", NULL, NULL );
                        free( ndn );
                        modlist_free( modlist );
-                       return rc;
+                       return LDAP_PROTOCOL_ERROR;
                }
                attr_normalize( (*modtail)->ml_type );
 
@@ -150,7 +151,7 @@ do_modify(
        } 
 
        Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD 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
@@ -160,14 +161,11 @@ do_modify(
        if ( (be = select_backend( ndn )) == NULL ) {
                free( ndn );
                modlist_free( modlist );
-               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;
        }
 
-       /* alias suffix if approp */
-       ndn = suffixAlias ( ndn, op, be );
-
        /*
         * do the modify if 1 && (2 || 3)
         * 1) there is a modify function implemented in this backend;
@@ -185,12 +183,12 @@ do_modify(
 
                /* send a referral */
                } 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 );