allow continuous mode

[openldap] / clients / tools / ldapwhoami.c

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 575e76a5d0c5335606fa1b7701c2988b80c3a11c..17d48b28e3981ac4abd6dd5867afc192778a3959 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -116,10 +116,10 @@ main( int argc, char *argv[] )
        char            *matcheddn = NULL, *text = NULL, **refs = NULL;
        char            *retoid = NULL;
        struct berval   *retdata = NULL;
-       int             id, code;
+       int             id, code = 0;
        LDAPMessage     *res;
 
-       tool_init();
+       tool_init( TOOL_WHOAMI );
        prog = lutil_progname( "ldapwhoami", argc, argv );
 
        /* LDAPv3 only */
@@ -149,19 +149,17 @@ main( int argc, char *argv[] )
 
        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 ) {
-               ldap_perror( ld, "ldap_extended_operation" );
+               tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
                rc = EXIT_FAILURE;
                goto skip;
        }
@@ -178,7 +176,7 @@ main( int argc, char *argv[] )
 
                rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
                if ( rc < 0 ) {
-                       ldap_perror( ld, "ldapwhoami: ldap_result" );
+                       tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
                        return rc;
                }
 
@@ -190,8 +188,12 @@ main( int argc, char *argv[] )
        rc = ldap_parse_result( ld, res,
                &code, &matcheddn, &text, &refs, NULL, 0 );
 
-       if( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_parse_result" );
+       if ( rc == LDAP_SUCCESS ) {
+               rc = code;
+       }
+
+       if ( rc != LDAP_SUCCESS ) {
+               tool_perror( "ldap_parse_result", rc, NULL, matcheddn, text, refs );
                rc = EXIT_FAILURE;
                goto skip;
        }
@@ -199,7 +201,7 @@ main( int argc, char *argv[] )
        rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
 
        if( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_parse_result" );
+               tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
                rc = EXIT_FAILURE;
                goto skip;
        }
@@ -212,8 +214,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 );
@@ -242,5 +244,5 @@ skip:
        tool_unbind( ld );
        tool_destroy();
 
-       return rc == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+       return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
 }