ITS#7897

[openldap] / clients / tools / ldapwhoami.c

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 17d48b28e3981ac4abd6dd5867afc192778a3959..1e653500e460fd5ac393a3cf2cf466e230a1b677 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2015 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 1998-2001 Net Boolean Incorporated.
  * Portions Copyright 2001-2003 IBM Corporation.
@@ -62,7 +62,7 @@ usage( void )
 
 
 const char options[] = ""
-       "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
+       "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
@@ -109,15 +109,12 @@ int
 main( int argc, char *argv[] )
 {
        int             rc;
-       char            *user = NULL;
-
        LDAP            *ld = NULL;
-
        char            *matcheddn = NULL, *text = NULL, **refs = NULL;
-       char            *retoid = NULL;
-       struct berval   *retdata = NULL;
+       struct berval   *authzid = NULL;
        int             id, code = 0;
-       LDAPMessage     *res;
+       LDAPMessage     *res = NULL;
+       LDAPControl     **ctrls = NULL;
 
        tool_init( TOOL_WHOAMI );
        prog = lutil_progname( "ldapwhoami", argc, argv );
@@ -127,22 +124,8 @@ main( int argc, char *argv[] )
 
        tool_args( argc, argv );
 
-       if( argc - optind > 1 ) {
+       if( argc - optind > 0 ) {
                usage();
-       } else if ( argc - optind == 1 ) {
-               user = strdup( argv[optind] );
-       } else {
-               user = NULL;
-       }
-
-       if ( pw_file || want_bindpw ) {
-               if ( pw_file ) {
-                       rc = lutil_get_filed_password( pw_file, &passwd );
-                       if( rc ) return EXIT_FAILURE;
-               } else {
-                       passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
-                       passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-               }
        }
 
        ld = tool_conn_setup( 0, 0 );
@@ -159,7 +142,7 @@ main( int argc, char *argv[] )
        rc = ldap_whoami( ld, NULL, NULL, &id ); 
 
        if( rc != LDAP_SUCCESS ) {
-               tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+               tool_perror( "ldap_whoami", rc, NULL, NULL, NULL, NULL );
                rc = EXIT_FAILURE;
                goto skip;
        }
@@ -168,7 +151,7 @@ main( int argc, char *argv[] )
                struct timeval  tv;
 
                if ( tool_check_abandon( ld, id ) ) {
-                       return LDAP_CANCELLED;
+                       tool_exit( ld, LDAP_CANCELLED );
                }
 
                tv.tv_sec = 0;
@@ -177,7 +160,7 @@ main( int argc, char *argv[] )
                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;
+                       tool_exit( ld, rc );
                }
 
                if ( rc != 0 ) {
@@ -186,7 +169,7 @@ main( int argc, char *argv[] )
        }
 
        rc = ldap_parse_result( ld, res,
-               &code, &matcheddn, &text, &refs, NULL, 0 );
+               &code, &matcheddn, &text, &refs, &ctrls, 0 );
 
        if ( rc == LDAP_SUCCESS ) {
                rc = code;
@@ -198,23 +181,27 @@ main( int argc, char *argv[] )
                goto skip;
        }
 
-       rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+       rc = ldap_parse_whoami( ld, res, &authzid );
 
        if( rc != LDAP_SUCCESS ) {
-               tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+               tool_perror( "ldap_parse_whoami", rc, NULL, NULL, NULL, NULL );
                rc = EXIT_FAILURE;
                goto skip;
        }
 
-       if( retdata != NULL ) {
-               if( retdata->bv_len == 0 ) {
+       if( authzid != NULL ) {
+               if( authzid->bv_len == 0 ) {
                        printf(_("anonymous\n") );
                } else {
-                       printf("%s\n", retdata->bv_val );
+                       printf("%s\n", authzid->bv_val );
                }
        }
 
-       if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) {
+skip:
+       ldap_msgfree(res);
+       if ( verbose || code != LDAP_SUCCESS ||
+               ( matcheddn && *matcheddn ) || ( text && *text ) || refs || ctrls )
+       {
                printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
 
                if( text && *text ) {
@@ -231,18 +218,18 @@ main( int argc, char *argv[] )
                                printf(_("Referral: %s\n"), refs[i] );
                        }
                }
+
+               if (ctrls) {
+                       tool_print_ctrls( ld, ctrls );
+                       ldap_controls_free( ctrls );
+               }
        }
 
        ber_memfree( text );
        ber_memfree( matcheddn );
        ber_memvfree( (void **) refs );
-       ber_memfree( retoid );
-       ber_bvfree( retdata );
+       ber_bvfree( authzid );
 
-skip:
        /* disconnect from server */
-       tool_unbind( ld );
-       tool_destroy();
-
-       return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+       tool_exit( ld, code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE );
 }