Always return SLAPD_ABANDON in response to op->o_abandon being set.

This commit is contained in:
Howard Chu 2005-02-18 00:37:40 +00:00
parent 554c667ec7
commit ee42df4cea
5 changed files with 8 additions and 6 deletions

View file

@ -649,7 +649,7 @@ loop_begin:
/* check for abandon */
if ( op->o_abandon ) {
rs->sr_err = LDAP_SUCCESS;
rs->sr_err = SLAPD_ABANDON;
goto done;
}

View file

@ -138,7 +138,7 @@ fail:;
/* check for abandon */
if ( op->o_abandon ) {
ldap_abandon_ext( lc->lc_ld, msgid, NULL, NULL );
rc = 0;
rc = SLAPD_ABANDON;
goto finish;
}
@ -291,7 +291,9 @@ fail:;
}
finish:;
send_ldap_result( op, rs );
if ( rc != SLAPD_ABANDON ) {
send_ldap_result( op, rs );
}
(void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );

View file

@ -232,7 +232,7 @@ searchit:
/* check for abandon */
if ( op->o_abandon ) {
rc = LDAP_SUCCESS;
rc = SLAPD_ABANDON;
goto done;
}

View file

@ -303,7 +303,7 @@ new_candidate:;
if ( ab ) {
ldap_abandon_ext( lsc->msc_ld, msgid[ i ], NULL, NULL );
rc = 0;
rc = SLAPD_ABANDON;
break;
}

View file

@ -143,7 +143,7 @@ passwd_back_search(
if ( op->o_abandon ) {
endpwent();
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
return( -1 );
return( SLAPD_ABANDON );
}
/* check time limit */