X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapwhoami.c;h=1e653500e460fd5ac393a3cf2cf466e230a1b677;hb=3f572f796650c77ee75ff8973bbb6d384cf9767b;hp=f81971dde08c8eb1b70bcb1b0bdffbbca266fbc4;hpb=0dcd32372c5e76e6173b8b798da99f043bb3100c;p=openldap
diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index f81971dde0..1e653500e4 100644
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -1,7 +1,34 @@
+/* ldapwhoami.c -- a tool for asking the directory "Who Am I?" */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission. This
+ * software is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software based, in part, on other client tools.
*/
#include "portable.h"
@@ -35,7 +62,7 @@ usage( void )
const char options[] = ""
- "Cd: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 )
@@ -44,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 );
@@ -66,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
@@ -80,16 +108,15 @@ handle_private_option( int i )
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;
-
- tool_init();
+ int rc;
+ LDAP *ld = NULL;
+ char *matcheddn = NULL, *text = NULL, **refs = NULL;
+ struct berval *authzid = NULL;
+ int id, code = 0;
+ LDAPMessage *res = NULL;
+ LDAPControl **ctrls = NULL;
+
+ tool_init( TOOL_WHOAMI );
prog = lutil_progname( "ldapwhoami", argc, argv );
/* LDAPv3 only */
@@ -97,48 +124,85 @@ 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 );
tool_bind( ld );
- if ( not ) {
+ if ( dont ) {
rc = LDAP_SUCCESS;
goto skip;
}
- if ( authzid || manageDSAit || noop )
- tool_server_controls( ld, NULL, 0 );
+ 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 ) {
+ tool_perror( "ldap_whoami", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ for ( ; ; ) {
+ struct timeval tv;
+
+ if ( tool_check_abandon( ld, id ) ) {
+ tool_exit( ld, 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 ) {
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+ tool_exit( ld, rc );
+ }
- if( retdata != NULL ) {
- if( retdata->bv_len == 0 ) {
+ if ( rc != 0 ) {
+ break;
+ }
+ }
+
+ rc = ldap_parse_result( ld, res,
+ &code, &matcheddn, &text, &refs, &ctrls, 0 );
+
+ 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;
+ }
+
+ rc = ldap_parse_whoami( ld, res, &authzid );
+
+ if( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_whoami", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
+
+ 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 || ( rc != LDAP_SUCCESS ) || matcheddn || text || refs ) {
- printf( _("Result: %s (%d)\n"), ldap_err2string( rc ), rc );
+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 ) {
printf( _("Additional info: %s\n"), text );
@@ -154,17 +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 */
- ldap_unbind (ld);
-
- return rc == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+ tool_exit( ld, code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE );
}