/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 1998-2001 Net Boolean Incorporated.
* Portions Copyright 2001-2003 IBM Corporation.
const char options[] = ""
- "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
+ "d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
#if 0
char *control, *cvalue;
int crit;
- case 'E': /* whoami controls */
+ case 'E': /* whoami extension */
if( protocol == LDAP_VERSION2 ) {
fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
prog, protocol );
if ( (cvalue = strchr( control, '=' )) != NULL ) {
*cvalue++ = '\0';
}
- fprintf( stderr, _("Invalid whoami control name: %s\n"), control );
+
+ fprintf( stderr, _("Invalid whoami extension name: %s\n"), control );
usage();
#endif
int
main( int argc, char *argv[] )
{
- int rc;
- char *user = NULL;
+ int rc;
+ char *user = NULL;
- LDAP *ld = NULL;
+ LDAP *ld = NULL;
- char *matcheddn = NULL, *text = NULL, **refs = NULL;
- char *retoid = NULL;
- struct berval *retdata = NULL;
+ char *matcheddn = NULL, *text = NULL, **refs = NULL;
+ char *retoid = NULL;
+ struct berval *retdata = NULL;
+ int id, code = 0;
+ LDAPMessage *res;
- tool_init();
+ tool_init( TOOL_WHOAMI );
prog = lutil_progname( "ldapwhoami", argc, argv );
/* LDAPv3 only */
tool_bind( ld );
- if ( not ) {
+ if ( dont ) {
rc = LDAP_SUCCESS;
goto skip;
}
- if ( assertion || authzid || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
+ tool_server_controls( ld, NULL, 0 );
+
+ rc = ldap_whoami( ld, NULL, NULL, &id );
+
+ if( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ for ( ; ; ) {
+ struct timeval tv;
+
+ if ( tool_check_abandon( ld, id ) ) {
+ return LDAP_CANCELLED;
+ }
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
+
+ rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
+ if ( rc < 0 ) {
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+ return rc;
+ }
+
+ if ( rc != 0 ) {
+ break;
+ }
+ }
+
+ rc = ldap_parse_result( ld, res,
+ &code, &matcheddn, &text, &refs, NULL, 0 );
+
+ if ( rc == LDAP_SUCCESS ) {
+ rc = code;
}
- rc = ldap_whoami_s( ld, &retdata, NULL, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_result", rc, NULL, matcheddn, text, refs );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+
+ if( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
if( retdata != NULL ) {
if( retdata->bv_len == 0 ) {
}
}
- if( verbose || ( rc != LDAP_SUCCESS ) || matcheddn || text || refs ) {
- printf( _("Result: %s (%d)\n"), ldap_err2string( rc ), rc );
+ if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) {
+ printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
if( text && *text ) {
printf( _("Additional info: %s\n"), text );
skip:
/* disconnect from server */
- ldap_unbind (ld);
+ tool_unbind( ld );
+ tool_destroy();
- return rc == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+ return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
}