X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ftest.c;h=404ffbfe29e0fb7146f63e36989d7bd431f55e19;hb=77b235fba53850c4d498284fb886357c857e92b9;hp=dc52cd1f6b68a7ab08c98567379136e089538171;hpb=669b8f4047c03d4583a44ed8287d0d5920d15373;p=openldap diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c index dc52cd1f6b..404ffbfe29 100644 --- a/libraries/libldap/test.c +++ b/libraries/libldap/test.c @@ -1,5 +1,6 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -228,38 +229,37 @@ get_modlist( char *prompt1, char *prompt2, char *prompt3 ) static int -bind_prompt( LDAP *ld, char **dnp, char **passwdp, int *authmethodp, - int freeit ) +bind_prompt( LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid) { static char dn[256], passwd[256]; + int authmethod; - if ( !freeit ) { -#ifdef HAVE_KERBEROS + printf("rebind for request=%d msgid=%ld url=%s\n", + request, (long) msgid, url ); + +#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); } @@ -301,7 +301,7 @@ main( int argc, char **argv ) 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 @@ -323,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: @@ -343,7 +343,7 @@ main( int argc, char **argv ) if ( errflg || optind < argc - 1 ) { fprintf( stderr, usage, argv[ 0 ] ); - exit( 1 ); + exit( EXIT_FAILURE ); } printf( "%s( %s, %d )\n", @@ -360,16 +360,16 @@ main( int argc, char **argv ) if ( ld == NULL ) { perror( cldapflg ? "cldap_open" : "ldap_init" ); - exit(1); + 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; @@ -412,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 ); @@ -438,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 ); @@ -446,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 ); @@ -486,7 +486,7 @@ main( int argc, char **argv ) 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 @@ -549,7 +549,7 @@ main( int argc, char **argv ) if ( !cldapflg ) { ldap_unbind( ld ); } - exit( 0 ); + exit( EXIT_SUCCESS ); break; case 'r': /* result or remove */ @@ -763,33 +763,6 @@ main( int argc, char **argv ) 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_API_FEATURE_X_OPENLDAP_V2_DNS - getline( line, sizeof(line), stdin, - "Use DN & DNS to determine where to send requests (0=no, 1=yes)?" ); - if ( atoi( line ) != 0 ) { - LDAP_BOOL_SET(&ld->ld_options, LDAP_BOOL_DNS); - } -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_DNS */ - getline( line, sizeof(line), stdin, "Recognize and chase referrals (0=no, 1=yes)?" ); if ( atoi( line ) != 0 ) { @@ -889,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" ); } } @@ -954,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;