ITS#4799 remove kbind

[openldap] / clients / tools / ldapwhoami.c

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 6cb7d6011f710875d1ebdd46e43860c401408b29..7d20097848df333638cd56b0770283e70c7f37b9 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-2007 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:InO:o:p:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
@@ -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,14 +149,12 @@ 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 );