mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 00:29:35 -05:00
Always return SLAPD_ABANDON in response to op->o_abandon being set.
This commit is contained in:
parent
554c667ec7
commit
ee42df4cea
5 changed files with 8 additions and 6 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ searchit:
|
|||
|
||||
/* check for abandon */
|
||||
if ( op->o_abandon ) {
|
||||
rc = LDAP_SUCCESS;
|
||||
rc = SLAPD_ABANDON;
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ new_candidate:;
|
|||
|
||||
if ( ab ) {
|
||||
ldap_abandon_ext( lsc->msc_ld, msgid[ i ], NULL, NULL );
|
||||
rc = 0;
|
||||
rc = SLAPD_ABANDON;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue