mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix prev commit

Browse Source
This commit is contained in:
Howard Chu 2009-07-13 13:14:07 +00:00
parent 91dc4501d4
commit c401792c20
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
servers/slapd/overlays/sssvlv.c
View File

@ -392,9 +392,9 @@ range_err:
} else { } else {
cur_node = tavl_end(so->so_tree, TAVL_DIR_RIGHT); cur_node = tavl_end(so->so_tree, TAVL_DIR_RIGHT);
dir = TAVL_DIR_LEFT; dir = TAVL_DIR_LEFT;
target = so->so_nentries - target; target = so->so_nentries - target + 1;
} }
for ( i=0; i<target; i++ ) for ( i=1; i<target; i++ )
cur_node = tavl_next( cur_node, dir ); cur_node = tavl_next( cur_node, dir );
} }
} else { } else {
@ -450,7 +450,13 @@ range_err:
if ( bv.bv_val != vc->vc_value.bv_val ) if ( bv.bv_val != vc->vc_value.bv_val )
op->o_tmpfree( bv.bv_val, op->o_tmpmemctx ); op->o_tmpfree( bv.bv_val, op->o_tmpmemctx );
} }
for ( i=0; i<vc->vc_before; i++ ) { if ( !cur_node ) {
i = 1;
cur_node = tavl_end(so->so_tree, TAVL_DIR_RIGHT);
} else {
i = 0;
}
for ( ; i<vc->vc_before; i++ ) {
tmp_node = tavl_next( cur_node, TAVL_DIR_LEFT ); tmp_node = tavl_next( cur_node, TAVL_DIR_LEFT );
if ( !tmp_node ) break; if ( !tmp_node ) break;
cur_node = tmp_node; cur_node = tmp_node;
@ -560,19 +566,21 @@ static void send_result(
sort_op *so) sort_op *so)
{ {
LDAPControl *ctrls[3]; LDAPControl *ctrls[3];
int rc; int rc, i = 0;
rc = pack_sss_response_control( op, rs, ctrls ); rc = pack_sss_response_control( op, rs, ctrls );
if ( rc == LDAP_SUCCESS ) { if ( rc == LDAP_SUCCESS ) {
i++;
rc = -1;
if ( so->so_paged > SLAP_CONTROL_IGNORED ) { if ( so->so_paged > SLAP_CONTROL_IGNORED ) {
rc = pack_pagedresult_response_control( op, rs, so, ctrls+1 ); rc = pack_pagedresult_response_control( op, rs, so, ctrls+1 );
} else if ( so->so_vlv > SLAP_CONTROL_IGNORED ) { } else if ( so->so_vlv > SLAP_CONTROL_IGNORED ) {
rc = pack_vlv_response_control( op, rs, so, ctrls+1 ); rc = pack_vlv_response_control( op, rs, so, ctrls+1 );
} }
ctrls[2] = NULL; if ( rc == LDAP_SUCCESS )
} else { i++;
ctrls[1] = NULL;
} }
ctrls[i] = NULL;
if ( ctrls[0] != NULL ) if ( ctrls[0] != NULL )
slap_add_ctrls( op, rs, ctrls ); slap_add_ctrls( op, rs, ctrls );