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

use /-* for all parents; ignore /-0; check syntax; better parsing

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-09-10 22:29:10 +00:00
parent 4137870344
commit a4b1ba0b5f
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
servers/slapd/sets.c
View File

@ -650,27 +650,33 @@ slap_set_filter( SLAP_SET_GATHER gatherer,
case '-': case '-':
if ( ( SF_TOP() == (void *)'/' ) if ( ( SF_TOP() == (void *)'/' )
&& ( *filter >= '0' || *filter <= '9' ) ) && ( *filter == '*' || ASCII_DIGIT( *filter ) ) )
{ {
int parent = 0;
int count = 1;
int i;
for ( len = 1;
( c = filter[ len ] )
&& ( c >= '0' && c <= '9' );
len++ )
/* count */ ;
for ( i = len ; i > 0 ; i-- ) {
parent += (int)( filter[ i - 1 ] - '0' ) * count;
count *= 10;
}
SF_POP(); SF_POP();
if ( parent == 0 ) {
if ( *filter == '*' ) {
set = set_parents( cp, SF_POP() ); set = set_parents( cp, SF_POP() );
filter++;
} else { } else {
set = set_parent( cp, SF_POP(), parent ); char *next = NULL;
long parent = strtol( filter, &next, 10 );
if ( next == filter ) {
SF_ERROR( syntax );
}
set = SF_POP();
if ( parent != 0 ) {
set = set_parent( cp, set, parent );
}
filter = next;
} }
filter += len;
if ( set == NULL ) {
SF_ERROR( memory );
}
SF_PUSH( set ); SF_PUSH( set );
set = NULL; set = NULL;
break; break;