X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapwhoami.c;h=17d48b28e3981ac4abd6dd5867afc192778a3959;hb=9bc2cd3987b0bf5b86c2b9be417d7119f2e9d623;hp=4ccb11aea27992cfcc230538ecd3970cb0968e99;hpb=dab6bdaaada7f7599c7fd58733ae183fefc33431;p=openldap
diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 4ccb11aea2..17d48b28e3 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-2006 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"
@@ -27,17 +54,15 @@
void
usage( void )
{
- fprintf(stderr,
-"Issue LDAP Who am I? operation to request user's authzid\n\n"
-"usage: %s [options]\n"
- , prog);
+ fprintf( stderr, _("Issue LDAP Who am I? operation to request user's authzid\n\n"));
+ fprintf( stderr, _("usage: %s [options]\n"), prog);
tool_common_usage();
exit( EXIT_FAILURE );
}
const char options[] = ""
- "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
+ "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
@@ -46,9 +71,9 @@ 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",
+ fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
prog, protocol );
exit( EXIT_FAILURE );
}
@@ -68,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
@@ -82,15 +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 = 0;
+ LDAPMessage *res;
+ tool_init( TOOL_WHOAMI );
prog = lutil_progname( "ldapwhoami", argc, argv );
/* LDAPv3 only */
@@ -111,7 +140,7 @@ main( int argc, char *argv[] )
rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE;
} else {
- passwd.bv_val = getpassphrase( "Enter LDAP Password: " );
+ passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
}
}
@@ -120,39 +149,86 @@ main( int argc, char *argv[] )
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( ld, NULL, NULL, &id );
+
+ if( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ 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 ) {
+ tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
+ return rc;
+ }
- rc = ldap_whoami_s( ld, &retdata, NULL, NULL );
+ if ( rc != 0 ) {
+ break;
+ }
+ }
+
+ rc = ldap_parse_result( ld, res,
+ &code, &matcheddn, &text, &refs, NULL, 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_extended_result( ld, res, &retoid, &retdata, 1 );
+
+ if( rc != LDAP_SUCCESS ) {
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto skip;
+ }
if( retdata != NULL ) {
if( retdata->bv_len == 0 ) {
- printf("anonymous\n" );
+ printf(_("anonymous\n") );
} else {
printf("%s\n", retdata->bv_val );
}
}
- 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 );
+ printf( _("Additional info: %s\n"), text );
}
if( matcheddn && *matcheddn ) {
- printf( "Matched DN: %s\n", matcheddn );
+ printf( _("Matched DN: %s\n"), matcheddn );
}
if( refs ) {
int i;
for( i=0; refs[i]; i++ ) {
- printf("Referral: %s\n", refs[i] );
+ printf(_("Referral: %s\n"), refs[i] );
}
}
}
@@ -165,7 +241,8 @@ main( int argc, char *argv[] )
skip:
/* disconnect from server */
- ldap_unbind (ld);
+ tool_unbind( ld );
+ tool_destroy();
- return rc == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+ return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
}