/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* OpenLDAP Filter API Test */
#include <ldap.h>
-#include "ldap-int.h"
+#include "ldap_pvt.h"
#include "ldif.h"
#include "lutil.h"
int usage()
{
fprintf( stderr, "usage:\n"
- "\tftest [-d n] filter" );
+ " ftest [-d n] filter\n"
+ " filter - RFC 2254 string representation of an "
+ "LDAP search filter\n" );
return EXIT_FAILURE;
}
int
main( int argc, char *argv[] )
{
- int i;
+ int c;
int debug=0;
- char *filter=NULL;
- while( (i = getopt( argc, argv, "Aa:Ss:" "d:" )) != EOF ) {
- switch ( i ) {
+ while( (c = getopt( argc, argv, "d:" )) != EOF ) {
+ switch ( c ) {
case 'd':
debug = atoi( optarg );
break;
}
}
- if( argc - optind > 1 ) {
- return usage();
-
- } else if ( argc - optind != 1 ) {
+ if ( argc - optind != 1 ) {
return usage();
}
static int filter2ber( char *filter )
{
int rc;
- struct berval *bv = NULL;
+ struct berval bv = {0};
BerElement *ber;
printf( "Filter: %s\n", filter );
return EXIT_FAILURE;
}
- rc = ldap_int_put_filter( ber, filter );
- if( rc ) {
- perror( "ber_flatten" );
+ rc = ldap_pvt_put_filter( ber, filter );
+ if( rc < 0 ) {
+ fprintf( stderr, "Filter error!\n");
return EXIT_FAILURE;
}
- rc = ber_flatten( ber, &bv );
+ rc = ber_flatten2( ber, &bv, 0 );
if( rc < 0 ) {
- perror( "ber_flatten" );
+ perror( "ber_flatten2" );
return EXIT_FAILURE;
}
- ber_bprint( bv->bv_val, bv->bv_len );
+ printf( "BER encoding (len=%ld):\n", (long) bv.bv_len );
+ ber_bprint( bv.bv_val, bv.bv_len );
- ber_free( ber, 0 );
- ber_bvfree( bv );
+ ber_free( ber, 1 );
return EXIT_SUCCESS;
}