X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ftest.c;h=404ffbfe29e0fb7146f63e36989d7bd431f55e19;hb=77b235fba53850c4d498284fb886357c857e92b9;hp=34c1eb9250257d81fbb73302abc5627a328df72f;hpb=dd51f860420a21b9d813600709d82a3d86e56e9b;p=openldap diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c index 34c1eb9250..404ffbfe29 100644 --- a/libraries/libldap/test.c +++ b/libraries/libldap/test.c @@ -1,7 +1,14 @@ +/* $OpenLDAP$ */ +/* + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * COPYING RESTRICTIONS APPLY, see COPYRIGHT file + */ + #include "portable.h" #include -#include + +#include #include #include @@ -20,15 +27,19 @@ #include -#include "lber.h" -#include "ldap.h" - /* including the "internal" defs is legit and nec. since this test routine has * a-priori knowledge of libldap internal workings. * hodges@stanford.edu 5-Feb-96 */ #include "ldap-int.h" +/* local functions */ +#ifndef HAVE_GETLINE +static char *getline LDAP_P(( char *line, int len, FILE *fp, char *prompt )); +#endif +static char **get_list LDAP_P(( char *prompt )); +static int file_read LDAP_P(( char *path, struct berval *bv )); +static LDAPMod **get_modlist LDAP_P(( char *prompt1, char *prompt2, char *prompt3 )); static void handle_result LDAP_P(( LDAP *ld, LDAPMessage *lm )); static void print_ldap_result LDAP_P(( LDAP *ld, LDAPMessage *lm, char *s )); static void print_search_entry LDAP_P(( LDAP *ld, LDAPMessage *res )); @@ -36,7 +47,7 @@ static void free_list LDAP_P(( char **list )); #define NOCACHEERRMSG "don't compile with -DLDAP_NOCACHE if you desire local caching" -char *dnsuffix; +static char *dnsuffix; #ifndef HAVE_GETLINE static char * @@ -103,7 +114,7 @@ static int file_read( char *path, struct berval *bv ) { FILE *fp; - long rlen; + ber_slen_t rlen; int eof; if (( fp = fopen( path, "r" )) == NULL ) { @@ -135,7 +146,7 @@ file_read( char *path, struct berval *bv ) eof = feof( fp ); fclose( fp ); - if ( (unsigned long) rlen != bv->bv_len ) { + if ( (ber_len_t) rlen != bv->bv_len ) { perror( path ); free( bv->bv_val ); return( -1 ); @@ -217,42 +228,39 @@ get_modlist( char *prompt1, char *prompt2, char *prompt3 ) } -#ifdef LDAP_REFERRALS -int -bind_prompt( LDAP *ld, char **dnp, char **passwdp, int *authmethodp, - int freeit ) +static int +bind_prompt( LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid) { static char dn[256], passwd[256]; + int authmethod; + + printf("rebind for request=%d msgid=%ld url=%s\n", + request, (long) msgid, url ); - if ( !freeit ) { -#ifdef HAVE_KERBEROS +#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND getline( dn, sizeof(dn), stdin, "re-bind method (0->simple, 1->krbv41, 2->krbv42, 3->krbv41&2)? " ); - if (( *authmethodp = atoi( dn )) == 3 ) { - *authmethodp = LDAP_AUTH_KRBV4; + if (( authmethod = atoi( dn )) == 3 ) { + authmethod = LDAP_AUTH_KRBV4; } else { - *authmethodp |= 0x80; + authmethod |= 0x80; } -#else /* HAVE_KERBEROS */ - *authmethodp = LDAP_AUTH_SIMPLE; -#endif /* HAVE_KERBEROS */ +#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ + authmethod = LDAP_AUTH_SIMPLE; +#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ getline( dn, sizeof(dn), stdin, "re-bind dn? " ); strcat( dn, dnsuffix ); - *dnp = dn; - if ( *authmethodp == LDAP_AUTH_SIMPLE && dn[0] != '\0' ) { + if ( authmethod == LDAP_AUTH_SIMPLE && dn[0] != '\0' ) { getline( passwd, sizeof(passwd), stdin, "re-bind password? " ); } else { passwd[0] = '\0'; } - *passwdp = passwd; - } - return( LDAP_SUCCESS ); + return ldap_bind_s( ld, dn, passwd, authmethod); } -#endif /* LDAP_REFERRALS */ int @@ -273,9 +281,6 @@ main( int argc, char **argv ) int copyoptions = 0; LDAPURLDesc *ludp; - extern char *optarg; - extern int optind; - host = NULL; port = LDAP_PORT; dnsuffix = ""; @@ -294,9 +299,11 @@ main( int argc, char **argv ) case 'd': #ifdef LDAP_DEBUG ldap_debug = atoi( optarg ); +#ifdef LBER_DEBUG if ( ldap_debug & LDAP_DEBUG_PACKETS ) { - lber_debug = ldap_debug; + ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug ); } +#endif #else printf( "Compile with -DLDAP_DEBUG for debugging\n" ); #endif @@ -316,12 +323,12 @@ main( int argc, char **argv ) case 't': /* copy ber's to given file */ copyfname = strdup( optarg ); - copyoptions = LBER_TO_FILE; +/* copyoptions = LBER_TO_FILE; */ break; case 'T': /* only output ber's to given file */ copyfname = strdup( optarg ); - copyoptions = (LBER_TO_FILE | LBER_TO_FILE_ONLY); +/* copyoptions = (LBER_TO_FILE | LBER_TO_FILE_ONLY); */ break; default: @@ -336,10 +343,11 @@ main( int argc, char **argv ) if ( errflg || optind < argc - 1 ) { fprintf( stderr, usage, argv[ 0 ] ); - exit( 1 ); + exit( EXIT_FAILURE ); } - printf( "%sldap_open( %s, %d )\n", cldapflg ? "c" : "", + printf( "%s( %s, %d )\n", + cldapflg ? "cldap_open" : "ldap_init", host == NULL ? "(null)" : host, port ); if ( cldapflg ) { @@ -347,21 +355,21 @@ main( int argc, char **argv ) ld = cldap_open( host, port ); #endif /* LDAP_CONNECTIONLESS */ } else { - ld = ldap_open( host, port ); + ld = ldap_init( host, port ); } if ( ld == NULL ) { - perror( "ldap_open" ); - exit(1); + perror( cldapflg ? "cldap_open" : "ldap_init" ); + exit( EXIT_FAILURE ); } if ( copyfname != NULL ) { - if ( (ld->ld_sb.sb_fd = open( copyfname, O_WRONLY | O_CREAT, + if ( ( ld->ld_sb->sb_fd = open( copyfname, O_WRONLY | O_CREAT, 0600 )) == -1 ) { perror( copyfname ); - exit ( 1 ); + exit ( EXIT_FAILURE ); } - ld->ld_sb.sb_options = copyoptions; + ld->ld_sb->sb_options = copyoptions; } bound = 0; @@ -404,13 +412,13 @@ main( int argc, char **argv ) break; case 'b': /* asynch bind */ -#ifdef HAVE_KERBEROS +#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND getline( line, sizeof(line), stdin, "method (0->simple, 1->krbv41, 2->krbv42)? " ); method = atoi( line ) | 0x80; -#else /* HAVE_KERBEROS */ +#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ method = LDAP_AUTH_SIMPLE; -#endif /* HAVE_KERBEROS */ +#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ getline( dn, sizeof(dn), stdin, "dn? " ); strcat( dn, dnsuffix ); @@ -430,7 +438,7 @@ main( int argc, char **argv ) break; case 'B': /* synch bind */ -#ifdef HAVE_KERBEROS +#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND getline( line, sizeof(line), stdin, "method 0->simple 1->krbv41 2->krbv42 3->krb? " ); method = atoi( line ); @@ -438,9 +446,9 @@ main( int argc, char **argv ) method = LDAP_AUTH_KRBV4; else method = method | 0x80; -#else /* HAVE_KERBEROS */ +#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ method = LDAP_AUTH_SIMPLE; -#endif /* HAVE_KERBEROS */ +#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ getline( dn, sizeof(dn), stdin, "dn? " ); strcat( dn, dnsuffix ); @@ -476,9 +484,11 @@ main( int argc, char **argv ) #ifdef LDAP_DEBUG getline( line, sizeof(line), stdin, "debug level? " ); ldap_debug = atoi( line ); +#ifdef LBER_DEBUG if ( ldap_debug & LDAP_DEBUG_PACKETS ) { - lber_debug = ldap_debug; + ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug ); } +#endif #else printf( "Compile with -DLDAP_DEBUG for debugging\n" ); #endif @@ -535,13 +545,11 @@ main( int argc, char **argv ) if ( cldapflg ) cldap_close( ld ); #endif /* LDAP_CONNECTIONLESS */ -#ifdef LDAP_REFERRALS - if ( !cldapflg ) -#else /* LDAP_REFERRALS */ - if ( !cldapflg && bound ) -#endif /* LDAP_REFERRALS */ + + if ( !cldapflg ) { ldap_unbind( ld ); - exit( 0 ); + } + exit( EXIT_SUCCESS ); break; case 'r': /* result or remove */ @@ -567,7 +575,7 @@ main( int argc, char **argv ) printf( "\nresult: msgtype %d msgid %d\n", msgtype, res->lm_msgid ); handle_result( ld, res ); - res = NULLMSG; + res = NULL; break; case 'm': /* remove */ @@ -610,7 +618,7 @@ main( int argc, char **argv ) printf( "\nresult: msgid %d\n", res->lm_msgid ); handle_result( ld, res ); - res = NULLMSG; + res = NULL; } #endif /* LDAP_CONNECTIONLESS */ } else { @@ -655,7 +663,7 @@ main( int argc, char **argv ) else { printf( "\nresult: err %d\n", id ); handle_result( ld, res ); - res = NULLMSG; + res = NULL; } free_list( types ); break; @@ -753,47 +761,18 @@ main( int argc, char **argv ) getline( line, sizeof(line), stdin, "sizelimit?" ); ld->ld_sizelimit = atoi( line ); - ld->ld_options = 0; + LDAP_BOOL_ZERO(&ld->ld_options); -#ifdef STR_TRANSLATION - getline( line, sizeof(line), stdin, - "Automatic translation of T.61 strings (0=no, 1=yes)?" ); - if ( atoi( line ) == 0 ) { - ld->ld_lberoptions &= ~LBER_TRANSLATE_STRINGS; - } else { - ld->ld_lberoptions |= LBER_TRANSLATE_STRINGS; -#ifdef LDAP_CHARSET_8859 - getline( line, sizeof(line), stdin, - "Translate to/from ISO-8859 (0=no, 1=yes?" ); - if ( atoi( line ) != 0 ) { - ldap_set_string_translators( ld, - ldap_8859_to_t61, - ldap_t61_to_8859 ); - } -#endif /* LDAP_CHARSET_8859 */ - } -#endif /* STR_TRANSLATION */ - -#ifdef LDAP_DNS - getline( line, sizeof(line), stdin, - "Use DN & DNS to determine where to send requests (0=no, 1=yes)?" ); - if ( atoi( line ) != 0 ) { - ld->ld_options |= LDAP_OPT_DNS; - } -#endif /* LDAP_DNS */ - -#ifdef LDAP_REFERRALS getline( line, sizeof(line), stdin, "Recognize and chase referrals (0=no, 1=yes)?" ); if ( atoi( line ) != 0 ) { - ld->ld_options |= LDAP_OPT_REFERRALS; + LDAP_BOOL_SET(&ld->ld_options, LDAP_BOOL_REFERRALS); getline( line, sizeof(line), stdin, "Prompt for bind credentials when chasing referrals (0=no, 1=yes)?" ); if ( atoi( line ) != 0 ) { ldap_set_rebind_proc( ld, bind_prompt ); } } -#endif /* LDAP_REFERRALS */ break; case 'O': /* set cache options */ @@ -883,7 +862,8 @@ handle_result( LDAP *ld, LDAPMessage *lm ) break; default: - printf( "Unknown result type 0x%x\n", lm->lm_msgtype ); + printf( "Unknown result type 0x%lx\n", + (unsigned long) lm->lm_msgtype ); print_ldap_result( ld, lm, "unknown" ); } } @@ -896,7 +876,7 @@ print_ldap_result( LDAP *ld, LDAPMessage *lm, char *s ) /* if ( ld->ld_error != NULL && *ld->ld_error != '\0' ) fprintf( stderr, "Additional info: %s\n", ld->ld_error ); - if ( NAME_ERROR( ld->ld_errno ) && ld->ld_matched != NULL ) + if ( LDAP_NAME_ERROR( ld->ld_errno ) && ld->ld_matched != NULL ) fprintf( stderr, "Matched DN: %s\n", ld->ld_matched ); */ } @@ -904,14 +884,14 @@ print_ldap_result( LDAP *ld, LDAPMessage *lm, char *s ) static void print_search_entry( LDAP *ld, LDAPMessage *res ) { - BerElement *ber; - char *a, *dn, *ufn; - struct berval **vals; - int i; LDAPMessage *e; - for ( e = ldap_first_entry( ld, res ); e != NULLMSG; - e = ldap_next_entry( ld, e ) ) { + for ( e = ldap_first_entry( ld, res ); e != NULL; + e = ldap_next_entry( ld, e ) ) + { + BerElement *ber = NULL; + char *a, *dn, *ufn; + if ( e->lm_msgtype == LDAP_RES_SEARCH_RESULT ) break; @@ -925,17 +905,21 @@ print_search_entry( LDAP *ld, LDAPMessage *res ) free( ufn ); for ( a = ldap_first_attribute( ld, e, &ber ); a != NULL; - a = ldap_next_attribute( ld, e, ber ) ) { + a = ldap_next_attribute( ld, e, ber ) ) + { + struct berval **vals; + printf( "\t\tATTR: %s\n", a ); if ( (vals = ldap_get_values_len( ld, e, a )) == NULL ) { printf( "\t\t\t(no values)\n" ); } else { + int i; for ( i = 0; vals[i] != NULL; i++ ) { int j, nonascii; nonascii = 0; - for ( j = 0; (unsigned long) j < vals[i]->bv_len; j++ ) + for ( j = 0; (ber_len_t) j < vals[i]->bv_len; j++ ) if ( !isascii( vals[i]->bv_val[j] ) ) { nonascii = 1; break; @@ -944,7 +928,7 @@ print_search_entry( LDAP *ld, LDAPMessage *res ) if ( nonascii ) { printf( "\t\t\tlength (%ld) (not ascii)\n", vals[i]->bv_len ); #ifdef BPRINT_NONASCII - lber_bprint( vals[i]->bv_val, + ber_bprint( vals[i]->bv_val, vals[i]->bv_len ); #endif /* BPRINT_NONASCII */ continue; @@ -955,9 +939,13 @@ print_search_entry( LDAP *ld, LDAPMessage *res ) ber_bvecfree( vals ); } } + + if(ber != NULL) { + ber_free( ber, 0 ); + } } if ( res->lm_msgtype == LDAP_RES_SEARCH_RESULT - || res->lm_chain != NULLMSG ) + || res->lm_chain != NULL ) print_ldap_result( ld, res, "search" ); }