/* $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
*/
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;
+
+ printf("rebind for request=%d msgid=%ld url=%s\n",
+ request, (long) msgid, url );
- if ( !freeit ) {
#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 /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
- *authmethodp = LDAP_AUTH_SIMPLE;
+ 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);
}
main( int argc, char **argv )
{
LDAP *ld = NULL;
- int i, c, port, cldapflg, errflg, method, id, msgtype;
+ int i, c, port, errflg, method, id, msgtype;
char line[256], command1, command2, command3;
char passwd[64], dn[256], rdn[64], attr[64], value[256];
char filter[256], *host, **types;
host = NULL;
port = LDAP_PORT;
dnsuffix = "";
- cldapflg = errflg = 0;
+ errflg = 0;
- while (( c = getopt( argc, argv, "uh:d:s:p:t:T:" )) != -1 ) {
+ while (( c = getopt( argc, argv, "h:d:s:p:t:T:" )) != -1 ) {
switch( c ) {
- case 'u':
-#ifdef LDAP_CONNECTIONLESS
- cldapflg++;
-#else /* LDAP_CONNECTIONLESS */
- printf( "Compile with -DLDAP_CONNECTIONLESS for UDP support\n" );
-#endif /* LDAP_CONNECTIONLESS */
- break;
-
case 'd':
#ifdef LDAP_DEBUG
ldap_debug = atoi( optarg );
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:
exit( EXIT_FAILURE );
}
- printf( "%s( %s, %d )\n",
- cldapflg ? "cldap_open" : "ldap_init",
+ printf( "ldap_init( %s, %d )\n",
host == NULL ? "(null)" : host, port );
- if ( cldapflg ) {
-#ifdef LDAP_CONNECTIONLESS
- ld = cldap_open( host, port );
-#endif /* LDAP_CONNECTIONLESS */
- } else {
- ld = ldap_init( host, port );
- }
+ ld = ldap_init( host, port );
if ( ld == NULL ) {
- perror( cldapflg ? "cldap_open" : "ldap_init" );
+ perror( "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 ( EXIT_FAILURE );
}
- ld->ld_sb.sb_options = copyoptions;
+ ld->ld_sb->sb_options = copyoptions;
}
bound = 0;
break;
case 'q': /* quit */
-#ifdef LDAP_CONNECTIONLESS
- if ( cldapflg )
- cldap_close( ld );
-#endif /* LDAP_CONNECTIONLESS */
-
- if ( !cldapflg ) {
- ldap_unbind( ld );
- }
+ ldap_unbind( ld );
exit( EXIT_SUCCESS );
break;
"attrsonly (0=attrs&values, 1=attrs only)? " );
attrsonly = atoi( line );
- if ( cldapflg ) {
-#ifdef LDAP_CONNECTIONLESS
- getline( line, sizeof(line), stdin,
- "Requestor DN (for logging)? " );
- if ( cldap_search_s( ld, dn, scope, filter, types,
- attrsonly, &res, line ) != 0 ) {
- ldap_perror( ld, "cldap_search_s" );
- } else {
- printf( "\nresult: msgid %d\n",
- res->lm_msgid );
- handle_result( ld, res );
- res = NULL;
- }
-#endif /* LDAP_CONNECTIONLESS */
- } else {
if (( id = ldap_search( ld, dn, scope, filter,
types, attrsonly )) == -1 ) {
ldap_perror( ld, "ldap_search" );
} else {
printf( "Search initiated with id %d\n", id );
}
- }
free_list( types );
break;
timeout.tv_sec = atoi( line );
break;
+#ifdef LDAP_UFN
case 'U': /* set ufn search prefix */
getline( line, sizeof(line), stdin, "ufn prefix? " );
ldap_ufn_setprefix( ld, line );
}
free_list( types );
break;
+#endif
case 'l': /* URL search */
getline( line, sizeof(line), stdin,
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 ) {
printf( " [B]ind async [c]ompare [l]URL search\n" );
printf( " [modi]fy [modr]dn [rem]ove\n" );
printf( " [res]ult [s]earch [q]uit/unbind\n\n" );
- printf( " [u]fn search [ut]fn search with timeout\n" );
+#ifdef LDAP_UFN
+ printf( " [u]fn search [ut]fn search with timeout [U]fn prefix\n" );
+#endif
printf( " [d]ebug [e]nable cache set ms[g]id\n" );
printf( " d[n]suffix [t]imeout [v]ersion\n" );
- printf( " [U]fn prefix [x]uncache entry [X]uncache request\n" );
printf( " [?]help [o]ptions [O]cache options\n" );
printf( " [E]xplode dn [p]arse LDAP URL\n" );
+ printf( " [x]uncache entry [X]uncache request\n" );
break;
default: