Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / clients / tools / common.c

diff --git a/clients/tools/common.c b/clients/tools/common.c
index e071020b69ff1c051b7c479012954835517046f3..05430415fa8c3fd638abd3107d8f5153a6247ecc 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -239,6 +239,10 @@ tool_init( tool_type_t type )
 void
 tool_destroy( void )
 {
+       static int destroyed;
+       if ( destroyed++ )
+               return;
+
 #ifdef HAVE_CYRUS_SASL
        sasl_done();
 #endif
@@ -337,7 +341,7 @@ N_("  -I         use SASL Interactive mode\n"),
 N_("  -n         show what would be done but don't actually do it\n"),
 N_("  -N         do not use reverse DNS to canonicalize SASL host name\n"),
 N_("  -O props   SASL security properties\n"),
-N_("  -o <opt>[=<optparam] general options\n"),
+N_("  -o <opt>[=<optparam>] general options\n"),
 N_("             nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
 N_("             ldif-wrap=<width> (in columns, or \"no\" for no wrapping)\n"),
 N_("  -p port    port on LDAP server\n"),
@@ -363,6 +367,8 @@ NULL
                        fputs( _(*cpp), stderr );
                }
        }
+
+       tool_destroy();
 }
 
 void tool_perror(
@@ -406,7 +412,7 @@ tool_args( int argc, char **argv )
                case 'c':       /* continuous operation mode */
                        contoper++;
                        break;
-               case 'C':
+               case 'C':       /* referrals: obsolete */
                        referrals++;
                        break;
                case 'd':
@@ -1125,6 +1131,12 @@ tool_args( int argc, char **argv )
                }
 #endif
        }
+
+       if ( ( pw_file || want_bindpw ) && !BER_BVISNULL( &passwd ) ) {
+               fprintf( stderr, "%s: -%c incompatible with -w\n",
+                       prog, ( pw_file ? 'y' : 'W' ) );
+               exit( EXIT_FAILURE );
+       }
 }
 
 
@@ -1317,23 +1329,24 @@ dnssrv_free:;
 
                if( private_setup ) private_setup( ld );
 
-               /* referrals */
+               /* referrals: obsolete */
                if( ldap_set_option( ld, LDAP_OPT_REFERRALS,
                        referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
                {
                        fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
                                referrals ? "on" : "off" );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
 #ifdef HAVE_CYRUS_SASL
                /* canon */
-               if( ldap_set_option( ld, LDAP_OPT_X_SASL_NOCANON,
-                       nocanon ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
-               {
-                       fprintf( stderr, "Could not set LDAP_OPT_X_SASL_NOCANON %s\n",
-                               nocanon ? "on" : "off" );
-                       exit( EXIT_FAILURE );
+               if( nocanon ) {
+                       if( ldap_set_option( ld, LDAP_OPT_X_SASL_NOCANON,
+                               LDAP_OPT_ON ) != LDAP_OPT_SUCCESS )
+                       {
+                               fprintf( stderr, "Could not set LDAP_OPT_X_SASL_NOCANON on\n" );
+                               tool_exit( ld, EXIT_FAILURE );
+                       }
                }
 #endif
                if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &protocol )
@@ -1341,7 +1354,7 @@ dnssrv_free:;
                {
                        fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n",
                                protocol );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                if ( use_tls ) {
@@ -1352,7 +1365,7 @@ dnssrv_free:;
                                tool_perror( "ldap_start_tls", rc, NULL, NULL, msg, NULL );
                                ldap_memfree(msg);
                                if ( use_tls > 1 ) {
-                                       exit( EXIT_FAILURE );
+                                       tool_exit( ld, EXIT_FAILURE );
                                }
                        }
                }
@@ -1363,7 +1376,7 @@ dnssrv_free:;
                        {
                                fprintf( stderr, "Could not set LDAP_OPT_NETWORK_TIMEOUT %ld\n",
                                        (long)nettimeout.tv_sec );
-                               exit( EXIT_FAILURE );
+                               tool_exit( ld, EXIT_FAILURE );
                        }
                }
        }
@@ -1397,8 +1410,8 @@ tool_bind( LDAP *ld )
        if ( sessionTracking ) {
                LDAPControl c;
 
-               if (stValue.bv_val == NULL && st_value( ld, &stValue ) ) {
-                       exit( EXIT_FAILURE );
+               if ( BER_BVISNULL( &stValue) && st_value( ld, &stValue ) ) {
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                c.ldctl_oid = LDAP_CONTROL_X_SESSION_TRACKING;
@@ -1422,7 +1435,7 @@ tool_bind( LDAP *ld )
 
                if ( pw_file ) {
                        if ( lutil_get_filed_password( pw_file, &passwd ) ) {
-                               exit( EXIT_FAILURE );
+                               tool_exit( ld, EXIT_FAILURE );
                        }
 
                } else {
@@ -1447,7 +1460,7 @@ tool_bind( LDAP *ld )
                                fprintf( stderr,
                                        "Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n",
                                        sasl_secprops );
-                               exit( LDAP_LOCAL_ERROR );
+                               tool_exit( ld, LDAP_LOCAL_ERROR );
                        }
                }
 
@@ -1469,11 +1482,11 @@ tool_bind( LDAP *ld )
                        tool_perror( "ldap_sasl_interactive_bind_s",
                                rc, NULL, NULL, msg, NULL );
                        ldap_memfree(msg);
-                       exit( rc );
+                       tool_exit( ld, rc );
                }
 #else
                fprintf( stderr, "%s: not compiled with SASL support\n", prog );
-               exit( LDAP_NOT_SUPPORTED );
+               tool_exit( ld, LDAP_NOT_SUPPORTED );
 #endif
        } else {
                int msgid, err, rc;
@@ -1493,26 +1506,26 @@ tool_bind( LDAP *ld )
                        if ( msgid == -1 ) {
                                tool_perror( "ldap_sasl_bind(SIMPLE)", rc,
                                        NULL, NULL, NULL, NULL );
-                               exit( rc );
+                               tool_exit( ld, rc );
                        }
                }
 
                rc = ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result );
                if ( rc == -1 ) {
                        tool_perror( "ldap_result", -1, NULL, NULL, NULL, NULL );
-                       exit( LDAP_LOCAL_ERROR );
+                       tool_exit( ld, LDAP_LOCAL_ERROR );
                }
 
                if ( rc == 0 ) {
                        tool_perror( "ldap_result", LDAP_TIMEOUT, NULL, NULL, NULL, NULL );
-                       exit( LDAP_LOCAL_ERROR );
+                       tool_exit( ld, LDAP_LOCAL_ERROR );
                }
 
                rc = ldap_parse_result( ld, result, &err, &matched, &info, &refs,
                        &ctrls, 1 );
                if ( rc != LDAP_SUCCESS ) {
                        tool_perror( "ldap_bind parse result", rc, NULL, matched, info, refs );
-                       exit( LDAP_LOCAL_ERROR );
+                       tool_exit( ld, LDAP_LOCAL_ERROR );
                }
 
 #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
@@ -1562,7 +1575,7 @@ tool_bind( LDAP *ld )
                        if( info ) ber_memfree( info );
                        if( refs ) ber_memvfree( (void **)refs );
 
-                       if ( err != LDAP_SUCCESS ) exit( err );
+                       if ( err != LDAP_SUCCESS ) tool_exit( ld, err );
                }
        }
 }
@@ -1579,6 +1592,16 @@ tool_unbind( LDAP *ld )
        (void) ldap_unbind_ext( ld, NULL, NULL );
 }
 
+void
+tool_exit( LDAP *ld, int status )
+{
+       if ( ld != NULL ) {
+               tool_unbind( ld );
+       }
+       tool_destroy();
+       exit( status );
+}
+
 
 /* Set server controls.  Add controls extra_c[0..count-1], if set. */
 void
@@ -1615,7 +1638,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
        ctrls = (LDAPControl**) malloc(sizeof(c) + (count + unknown_ctrls_num + 1)*sizeof(LDAPControl*));
        if ( ctrls == NULL ) {
                fprintf( stderr, "No memory\n" );
-               exit( EXIT_FAILURE );
+               tool_exit( ld, EXIT_FAILURE );
        }
 
        if ( assertctl ) {
@@ -1655,11 +1678,11 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
                ber_init2( ber, NULL, LBER_USE_DER );
 
                if ( ber_printf( ber, "s", proxydn ) == -1 ) {
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                if ( ber_flatten2( ber, &c[i].ldctl_value, 0 ) == -1 ) {
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                c[i].ldctl_oid = LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ;
@@ -1716,13 +1739,13 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
 
                if( ber_printf( ber, "{v}", attrs ) == -1 ) {
                        fprintf( stderr, "preread attrs encode failed.\n" );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                err = ber_flatten2( ber, &c[i].ldctl_value, 0 );
                if( err < 0 ) {
                        fprintf( stderr, "preread flatten failed (%d)\n", err );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                c[i].ldctl_oid = LDAP_CONTROL_PRE_READ;
@@ -1746,13 +1769,13 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
 
                if( ber_printf( ber, "{v}", attrs ) == -1 ) {
                        fprintf( stderr, "postread attrs encode failed.\n" );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                err = ber_flatten2( ber, &c[i].ldctl_value, 0 );
                if( err < 0 ) {
                        fprintf( stderr, "postread flatten failed (%d)\n", err );
-                       exit( EXIT_FAILURE );
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                c[i].ldctl_oid = LDAP_CONTROL_POST_READ;
@@ -1775,7 +1798,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
                        if ( err == -1 ) {
                                ber_free( ber, 1 );
                                fprintf( stderr, _("Chaining behavior control encoding error!\n") );
-                               exit( EXIT_FAILURE );
+                               tool_exit( ld, EXIT_FAILURE );
                        }
 
                        if ( chainingContinuation > -1 ) {
@@ -1783,7 +1806,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
                                if ( err == -1 ) {
                                        ber_free( ber, 1 );
                                        fprintf( stderr, _("Chaining behavior control encoding error!\n") );
-                                       exit( EXIT_FAILURE );
+                                       tool_exit( ld, EXIT_FAILURE );
                                }
                        }
 
@@ -1791,11 +1814,11 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
                        if ( err == -1 ) {
                                ber_free( ber, 1 );
                                fprintf( stderr, _("Chaining behavior control encoding error!\n") );
-                               exit( EXIT_FAILURE );
+                               tool_exit( ld, EXIT_FAILURE );
                        }
 
                        if ( ber_flatten2( ber, &c[i].ldctl_value, 0 ) == -1 ) {
-                               exit( EXIT_FAILURE );
+                               tool_exit( ld, EXIT_FAILURE );
                        }
 
                } else {
@@ -1811,8 +1834,8 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
 
 #ifdef LDAP_CONTROL_X_SESSION_TRACKING
        if ( sessionTracking ) {
-               if ( stValue.bv_val == NULL && st_value( ld, &stValue ) ) {
-                       exit( EXIT_FAILURE );
+               if ( BER_BVISNULL( &stValue ) && st_value( ld, &stValue ) ) {
+                       tool_exit( ld, EXIT_FAILURE );
                }
 
                c[i].ldctl_oid = LDAP_CONTROL_X_SESSION_TRACKING;
@@ -1844,7 +1867,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
 
        free( ctrls );
        if ( crit ) {
-               exit( EXIT_FAILURE );
+               tool_exit( ld, EXIT_FAILURE );
        }
 }
 
@@ -2360,4 +2383,3 @@ tool_is_oid( const char *s )
 
        return 1;
 }
-