upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use new paged results control client API (ITS#4314)

Browse source
This commit is contained in:
Pierangelo Masarati 2006-01-08 22:49:24 +00:00
parent 564dca34bf
commit 5640f6313a
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clients/tools/common.c
View file

@ -1406,24 +1406,23 @@ print_postread( LDAP *ld, LDAPControl *ctrl )
static int static int
print_paged_results( LDAP *ld, LDAPControl *ctrl ) print_paged_results( LDAP *ld, LDAPControl *ctrl )
{ {
BerElement *ber; unsigned long estimate;
ber_int_t estimate;
ber = ber_init( &ctrl->ldctl_value );
/* note: pr_cookie is being malloced; it's freed /* note: pr_cookie is being malloced; it's freed
* the next time the control is sent, but the last * the next time the control is sent, but the last
* time it's not; we don't care too much, because * time it's not; we don't care too much, because
* the last time an empty value is returned... */ * the last time an empty value is returned... */
if ( ber_scanf( ber, "{io}", &estimate, &pr_cookie ) == LBER_ERROR ) { if ( ldap_parse_pageresponse_control( ld, ctrl, &estimate, &pr_cookie ) != LDAP_SUCCESS ) {
/* error? */ /* error? */
return 1; return 1;
} else { } else {
/* FIXME: check buffer overflow */
char buf[ BUFSIZ ], *ptr = buf; char buf[ BUFSIZ ], *ptr = buf;
if ( estimate > 0 ) { if ( estimate > 0 ) {
ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ), ptr += snprintf( ptr, sizeof( buf ) - ( ptr - buf ),
"estimate=%d", estimate ); "estimate=%lu", estimate );
} }
if ( pr_cookie.bv_len > 0 ) { if ( pr_cookie.bv_len > 0 ) {
@ -1455,10 +1454,6 @@ print_paged_results( LDAP *ld, LDAPControl *ctrl )
"pagedresults", buf, ptr - buf ); "pagedresults", buf, ptr - buf );
} }
if ( ber != NULL ) {
ber_free( ber, 1 );
}
return 0; return 0;
} }

9
clients/tools/ldapsearch.c
View file

@ -627,7 +627,7 @@ main( int argc, char **argv )
FILE *fp = NULL; FILE *fp = NULL;
int rc, i, first; int rc, i, first;
LDAP *ld = NULL; LDAP *ld = NULL;
BerElement *seber = NULL, *vrber = NULL, *prber = NULL; BerElement *seber = NULL, *vrber = NULL;
BerElement *syncber = NULL; BerElement *syncber = NULL;
struct berval *syncbvalp = NULL; struct berval *syncbvalp = NULL;
@ -851,14 +851,10 @@ getNextPage:
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (( prber = ber_alloc_t(LBER_USE_DER)) == NULL ) { if ( ldap_create_page_control_value( ld, pageSize, &pr_cookie, &c[i].ldctl_value ) ) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ber_printf( prber, "{iO}", pageSize, &pr_cookie );
if ( ber_flatten2( prber, &c[i].ldctl_value, 0 ) == -1 ) {
return EXIT_FAILURE;
}
if ( pr_cookie.bv_val != NULL ) { if ( pr_cookie.bv_val != NULL ) {
ber_memfree( pr_cookie.bv_val ); ber_memfree( pr_cookie.bv_val );
pr_cookie.bv_val = NULL; pr_cookie.bv_val = NULL;
@ -878,7 +874,6 @@ getNextPage:
ber_free( seber, 1 ); ber_free( seber, 1 );
ber_free( vrber, 1 ); ber_free( vrber, 1 );
ber_free( prber, 1 );
} }
if ( verbose ) { if ( verbose ) {