Merge remote branch 'origin/mdb.master'

[openldap] / clients / tools / ldapexop.c

diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c
index 9d77fbab5a0950832efa640740c491cbfd0fb914..6fc4d1e3c6b3a1f93746ff3f6bbf92fb85a52e9e 100644 (file)
--- a/clients/tools/ldapexop.c
+++ b/clients/tools/ldapexop.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2008 The OpenLDAP Foundation.
+ * Copyright 2005-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,13 +43,16 @@ usage( void )
 {
        fprintf( stderr, _("Issue LDAP extended operations\n\n"));
        fprintf( stderr, _("usage: %s [options] <oid|oid:data|oid::b64data>\n"), prog);
+       fprintf( stderr, _("       %s [options] whoami\n"), prog);
+       fprintf( stderr, _("       %s [options] cancel <id>\n"), prog);
+       fprintf( stderr, _("       %s [options] refresh <DN> [<ttl>]\n"), prog);
        tool_common_usage();
        exit( EXIT_FAILURE );
 }
 
 
 const char options[] = ""
-       "d:D:e:h:H:InO:o: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 )
@@ -72,7 +75,7 @@ main( int argc, char *argv[] )
        char            *matcheddn = NULL, *text = NULL, **refs = NULL;
        LDAPControl **ctrls = NULL;
        int             id, code;
-       LDAPMessage     *res;
+       LDAPMessage     *res = NULL;
 
        tool_init( TOOL_EXOP );
        prog = lutil_progname( "ldapexop", argc, argv );
@@ -86,16 +89,6 @@ main( int argc, char *argv[] )
                usage();
        }
 
-       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 );
@@ -152,8 +145,6 @@ main( int argc, char *argv[] )
                case 2:
                        dn.bv_val = argv[ 1 ];
                        dn.bv_len = strlen( dn.bv_val );
-
-               case 1:
                        break;
 
                default:
@@ -256,7 +247,7 @@ main( int argc, char *argv[] )
                char            *retoid = NULL;
                struct berval   *retdata = NULL;
 
-               rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+               rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 0 );
 
                if ( rc != LDAP_SUCCESS ) {
                        tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
@@ -303,7 +294,7 @@ main( int argc, char *argv[] )
                        printf(_("# extended operation response\n"));
                }
 
-               rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+               rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 0 );
                if ( rc != LDAP_SUCCESS ) {
                        tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
                        rc = EXIT_FAILURE;
@@ -327,7 +318,8 @@ main( int argc, char *argv[] )
                }
        }
 
-       if( verbose || ( code != LDAP_SUCCESS ) || matcheddn || text || refs ) {
+       if( verbose || code != LDAP_SUCCESS ||
+               ( matcheddn && *matcheddn ) || ( text && *text ) || refs ) {
                printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
 
                if( text && *text ) {
@@ -357,6 +349,8 @@ main( int argc, char *argv[] )
 
 skip:
        /* disconnect from server */
+       if ( res )
+               ldap_msgfree( res );
        tool_unbind( ld );
        tool_destroy();