drop stored procedures

[openldap] / clients / tools / ldapwhoami.c

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 82f187a55a0370a8d9cb3940e7f37540df591d35..e97a8dca114616204b0faf9395c4136fd8e4c246 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -108,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 */
@@ -156,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 ) {
@@ -166,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 );
@@ -196,5 +242,5 @@ skip:
        tool_unbind( ld );
        tool_destroy();
 
-       return rc == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+       return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
 }