fix previous commit (was causing failure of test028)

[openldap] / clients / tools / ldapwhoami.c

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index abbf45b923774a71a6887abd0908760c7eba7d68..e97a8dca114616204b0faf9395c4136fd8e4c246 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -71,7 +71,7 @@ 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 );
@@ -93,7 +93,8 @@ handle_private_option( int i )
                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
 
@@ -107,16 +108,18 @@ handle_private_option( int i )
 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;
+       LDAPMessage     *res;
 
-    tool_init();
+       tool_init();
        prog = lutil_progname( "ldapwhoami", argc, argv );
 
        /* LDAPv3 only */
@@ -155,7 +158,51 @@ main( int argc, char *argv[] )
                tool_server_controls( ld, NULL, 0 );
        }
 
-       rc = ldap_whoami_s( ld, &retdata, NULL, NULL ); 
+       rc = ldap_whoami( ld, NULL, NULL, &id ); 
+
+       if( rc != LDAP_SUCCESS ) {
+               ldap_perror( ld, "ldap_extended_operation" );
+               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 ) {
+                       ldap_perror( ld, "ldapwhoami: ldap_result" );
+                       return rc;
+               }
+
+               if ( rc != 0 ) {
+                       break;
+               }
+       }
+
+       rc = ldap_parse_result( ld, res,
+               &code, &matcheddn, &text, &refs, NULL, 0 );
+
+       if( rc != LDAP_SUCCESS ) {
+               ldap_perror( ld, "ldap_parse_result" );
+               rc = EXIT_FAILURE;
+               goto skip;
+       }
+
+       rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+
+       if( rc != LDAP_SUCCESS ) {
+               ldap_perror( ld, "ldap_parse_result" );
+               rc = EXIT_FAILURE;
+               goto skip;
+       }
 
        if( retdata != NULL ) {
                if( retdata->bv_len == 0 ) {
@@ -165,8 +212,8 @@ main( int argc, char *argv[] )
                }
        }
 
-       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 );
@@ -192,7 +239,8 @@ main( int argc, char *argv[] )
 
 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;
 }