]> git.sur5r.net Git - openldap/blobdiff - clients/tools/ldappasswd.c
fix previous commit (ITS#3905)
[openldap] / clients / tools / ldappasswd.c
index d2e92702e9bd672ed9088bfd260fd07aee8b7abc..31556695c0f310e4bbeeb7a6566bfc41ff59d7ec 100644 (file)
@@ -1,7 +1,36 @@
+/* ldappasswd -- a tool for change LDAP passwords */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* 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:
+ * The original ldappasswd(1) tool was developed by Dave Storey (F5
+ * Network), based on other OpenLDAP client tools (which are, of
+ * course, based on U-MICH LDAP).  This version was rewritten
+ * by Kurt D. Zeilenga (based on other OpenLDAP client tools).
  */
 
 #include "portable.h"
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
-#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 
 #include <ldap.h>
-
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
-static int     verbose = 0;
+#include "common.h"
 
-static void
-usage(const char *s)
-{
-       fprintf(stderr,
-"Change the password of an LDAP entry\n\n"
-"usage: %s [options] dn\n"
-"      dn: the DN of the entry whose password must be changed\n"
-"Password change options:\n"
-"      -a secret\told password\n"
-"      -A\t\tprompt for old password\n"
-"      -s secret\tnew password\n"
-"      -S\t\tprompt for new password\n"
-
-"Common options:\n"
-"      -d level\tdebugging level\n"
-"      -C\t\tchase referrals\n"
-"      -D binddn\tbind DN\n"
-"      -h host\t\tLDAP server (default: localhost)\n"
-"      -n\t\tmake no modifications\n"
-"      -O secprops\tSASL security properties\n"
-"      -p port\t\tport on LDAP server\n"
-"      -U user\t\tSASL authentication identity (username)\n"
-"      -v\t\tverbose mode\n"
-"      -w passwd\tbind password (for simple authentication)\n"
-"      -W\t\tprompt for bind password\n"
-"      -x\t\tSimple authentication\n"
-"      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
-"      -Y mech\t\tSASL mechanism\n"
-"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
-               , s );
 
+static struct berval newpw = { 0, NULL };
+static struct berval oldpw = { 0, NULL };
+
+static int   want_newpw = 0;
+static int   want_oldpw = 0;
+
+static char *oldpwfile = NULL;
+static char *newpwfile = NULL;
+
+void
+usage( void )
+{
+       fprintf( stderr, _("Change password of an LDAP user\n\n"));
+       fprintf( stderr,_("usage: %s [options] [user]\n"), prog);
+       fprintf( stderr, _("  user: the authentication identity, commonly a DN\n"));
+       fprintf( stderr, _("Password change options:\n"));
+       fprintf( stderr, _("  -a secret  old password\n"));
+       fprintf( stderr, _("  -A         prompt for old password\n"));
+       fprintf( stderr, _("  -t file    read file for old password\n"));
+       fprintf( stderr, _("  -s secret  new password\n"));
+       fprintf( stderr, _("  -S         prompt for new password\n"));
+       fprintf( stderr, _("  -T file    read file for new password\n"));
+       tool_common_usage();
        exit( EXIT_FAILURE );
 }
 
-int
-main( int argc, char *argv[] )
-{
-       int rc;
-       char    *prog = NULL;
-       char    *ldaphost = NULL;
-
-       char    *dn = NULL;
-       char    *binddn = NULL;
-
-       struct berval passwd = { 0, NULL };
-       char    *newpw = NULL;
-       char    *oldpw = NULL;
-
-       int             want_bindpw = 0;
-       int             want_newpw = 0;
-       int             want_oldpw = 0;
-
-       int             noupdates = 0;
-       int             i;
-       int             ldapport = 0;
-       int             debug = 0;
-       int             version = -1;
-       int             authmethod = -1;
-#ifdef HAVE_CYRUS_SASL
-       char            *sasl_authc_id = NULL;
-       char            *sasl_authz_id = NULL;
-       char            *sasl_mech = NULL;
-       char            *sasl_secprops = NULL;
-#endif
-       int             use_tls = 0;
-       int             referrals = 0;
-       LDAP           *ld;
-       struct berval *bv = NULL;
 
-       int id, code;
-       LDAPMessage *res;
-       char *matcheddn = NULL, *text = NULL, **refs = NULL;
-       char    *retoid = NULL;
-       struct berval *retdata = NULL;
+const char options[] = "a:As:St:T:"
+       "d:D:e:h:H:InO:p:QR:U:vVw:WxX:y:Y:Z";
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
-
-       if (argc == 1)
-               usage (argv[0]);
+int
+handle_private_option( int i )
+{
+       switch ( i ) {
+#if 0
+       case 'E': /* passwd extensions */ {
+               int             crit;
+               char    *control, *cvalue;
+               if( protocol == LDAP_VERSION2 ) {
+                       fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
+                                prog, protocol );
+                       exit( EXIT_FAILURE );
+               }
 
-       while( (i = getopt( argc, argv,
-               "Aa:Ss:" "Cd:D:h:nO:p:U:vw:WxX:Y:Z" )) != EOF )
-       {
-               switch (i) {
-               /* Password Options */
-               case 'A':       /* prompt for old password */
-                       want_oldpw++;
-                       break;
+               /* should be extended to support comma separated list of
+                *      [!]key[=value] parameters, e.g.  -E !foo,bar=567
+                */
 
-               case 'a':       /* old password (secret) */
-                       oldpw = strdup (optarg);
+               crit = 0;
+               cvalue = NULL;
+               if( optarg[0] == '!' ) {
+                       crit = 1;
+                       optarg++;
+               }
 
-                       {
-                               char* p;
+               control = strdup( optarg );
+               if ( (cvalue = strchr( control, '=' )) != NULL ) {
+                       *cvalue++ = '\0';
+               }
+               fprintf( stderr, _("Invalid passwd extension name: %s\n"), control );
+               usage();
+               }
+#endif
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
+       case 'a':       /* old password (secret) */
+               oldpw.bv_val = strdup( optarg );
+               {
+                       char* p;
+                       for( p = optarg; *p != '\0'; p++ ) {
+                               *p = '\0';
                        }
-                       break;
-
-               case 'S':       /* prompt for user password */
-                       want_newpw++;
-                       break;
+               }
+               oldpw.bv_len = strlen( oldpw.bv_val );
+               break;
 
-               case 's':       /* new password (secret) */
-                       newpw = strdup (optarg);
-                       {
-                               char* p;
+       case 'A':       /* prompt for old password */
+               want_oldpw++;
+               break;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
+       case 's':       /* new password (secret) */
+               newpw.bv_val = strdup (optarg);
+               {
+                       char* p;
+                       for( p = optarg; *p != '\0'; p++ ) {
+                               *p = '\0';
                        }
-                       break;
+               }
+               newpw.bv_len = strlen( newpw.bv_val );
+               break;
 
-               /* Common Options */
-               case 'C':
-                       referrals++;
-                       break;
+       case 'S':       /* prompt for user password */
+               want_newpw++;
+               break;
 
-               case 'D':       /* bind distinguished name */
-                       binddn = strdup (optarg);
-                       break;
+       case 't':
+               oldpwfile = optarg;
+               break;
 
-               case 'd':       /* debugging option */
-                       debug |= atoi (optarg);
-                       break;
+       case 'T':
+               newpwfile = optarg;
+               break;
 
-               case 'h':       /* ldap host */
-                       ldaphost = strdup (optarg);
-                       break;
+       default:
+               return 0;
+       }
+       return 1;
+}
 
-               case 'n':       /* don't update entry(s) */
-                       noupdates++;
-                       break;
 
-               case 'p':       /* ldap port */
-                       ldapport = strtol( optarg, NULL, 10 );
-                       break;
+int
+main( int argc, char *argv[] )
+{
+       int rc;
+       char    *user = NULL;
 
-               case 'v':       /* verbose */
-                       verbose++;
-                       break;
+       LDAP           *ld = NULL;
+       struct berval bv = {0, NULL};
+       BerElement  *ber = NULL;
 
-               case 'W':       /* prompt for bind password */
-                       want_bindpw++;
-                       break;
+       int id, code = LDAP_OTHER;
+       LDAPMessage *res;
+       char *matcheddn = NULL, *text = NULL, **refs = NULL;
+       char    *retoid = NULL;
+       struct berval *retdata = NULL;
 
-               case 'w':       /* bind password */
-                       passwd.bv_val = strdup (optarg);
-                       {
-                               char* p;
+    tool_init();
+       prog = lutil_progname( "ldappasswd", argc, argv );
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
-                       }
-                       passwd.bv_len = strlen( passwd.bv_val );
-                       break;
+       /* LDAPv3 only */
+       protocol = LDAP_VERSION3;
 
-               case 'O':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_secprops = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL support\n",
-                               argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'Y':
-#ifdef HAVE_CYRUS_SASL
-                       if ( strcasecmp( optarg, "any" ) &&
-                                       strcmp( optarg, "*" ) ) {
-                               sasl_mech = strdup( optarg );
-                       }
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'U':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_authc_id = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'x':
-                       if( authmethod != -1 && authmethod != LDAP_AUTH_SIMPLE ) {
-                               fprintf( stderr, "%s: incompatible with previous "
-                                       "authentication choice\n", prog );
-                               return EXIT_FAILURE;
-                       }
-                       authmethod = LDAP_AUTH_SIMPLE;
-                       break;
-               case 'X':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_authz_id = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'Z':
-#ifdef HAVE_TLS
-                       use_tls++;
-#else
-                       fprintf( stderr, "%s was not compiled with TLS "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
+       tool_args( argc, argv );
 
-               default:
-                       fprintf( stderr, "%s: unrecongized option -%c\n",
-                               prog, optopt );
-                       usage (argv[0]);
-               }
+       if( argc - optind > 1 ) {
+               usage();
+       } else if ( argc - optind == 1 ) {
+               user = strdup( argv[optind] );
+       } else {
+               user = NULL;
        }
 
-       if( argc - optind != 1 ) {
-               usage( argv[0] );
-       } 
-
-       if (authmethod == -1) {
-#ifdef HAVE_CYRUS_SASL
-               authmethod = LDAP_AUTH_SASL;
-#else
-               authmethod = LDAP_AUTH_SIMPLE;
-#endif
+       if( oldpwfile ) {
+               rc = lutil_get_filed_password( oldpwfile, &oldpw );
+               if( rc ) {
+                       rc = EXIT_FAILURE;
+                       goto done;
+               }
        }
 
-       dn = strdup( argv[optind] );
-
-       if( want_oldpw && oldpw == NULL ) {
+       if( want_oldpw && oldpw.bv_val == NULL ) {
                /* prompt for old password */
                char *ckoldpw;
-               newpw = strdup(getpassphrase("Old password: "));
-               ckoldpw = getpassphrase("Re-enter old password: ");
+               oldpw.bv_val = strdup(getpassphrase(_("Old password: ")));
+               ckoldpw = getpassphrase(_("Re-enter old password: "));
 
-               if( newpw== NULL || ckoldpw == NULL ||
-                       strncmp( oldpw, ckoldpw, strlen(oldpw) ))
+               if( oldpw.bv_val == NULL || ckoldpw == NULL ||
+                       strcmp( oldpw.bv_val, ckoldpw ))
                {
-                       fprintf( stderr, "passwords do not match\n" );
-                       return EXIT_FAILURE;
+                       fprintf( stderr, _("passwords do not match\n") );
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
-       }
-
-       if( want_newpw && newpw == NULL ) {
-               /* prompt for new password */
-               char *cknewpw;
-               newpw = strdup(getpassphrase("New password: "));
-               cknewpw = getpassphrase("Re-enter new password: ");
 
-               if( newpw== NULL || cknewpw == NULL ||
-                       strncmp( newpw, cknewpw, strlen(newpw) ))
-               {
-                       fprintf( stderr, "passwords do not match\n" );
-                       return EXIT_FAILURE;
-               }
+               oldpw.bv_len = strlen( oldpw.bv_val );
        }
 
-       if( binddn == NULL && dn != NULL ) {
-               binddn = dn;
-               dn = NULL;
-
-               if( passwd.bv_val == NULL ) {
-                       passwd.bv_val = oldpw;
-                       passwd.bv_len = oldpw == NULL ? 0 : strlen( oldpw );
+       if( newpwfile ) {
+               rc = lutil_get_filed_password( newpwfile, &newpw );
+               if( rc ) {
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
        }
 
-       if (want_bindpw && passwd.bv_val == NULL ) {
-               /* handle bind password */
-               fprintf( stderr, "Bind DN: %s\n", binddn );
-               passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
-               passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
-       }
+       if( want_newpw && newpw.bv_val == NULL ) {
+               /* prompt for new password */
+               char *cknewpw;
+               newpw.bv_val = strdup(getpassphrase(_("New password: ")));
+               cknewpw = getpassphrase(_("Re-enter new password: "));
 
-       if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
-               }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
+               if( newpw.bv_val == NULL || cknewpw == NULL ||
+                       strcmp( newpw.bv_val, cknewpw ))
+               {
+                       fprintf( stderr, _("passwords do not match\n") );
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
-       }
 
-#ifdef SIGPIPE
-       (void) SIGNAL( SIGPIPE, SIG_IGN );
-#endif
-
-       /* connect to server */
-       if ((ld = ldap_init( ldaphost, ldapport )) == NULL) {
-               perror("ldap_init");
-               return EXIT_FAILURE;
-       }
-
-       /* referrals */
-       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" );
-               return EXIT_FAILURE;
+               newpw.bv_len = strlen( newpw.bv_val );
        }
 
-       /* LDAPv3 only */
-       version = 3;
-       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
+       if ( pw_file ) {
+               rc = lutil_get_filed_password( pw_file, &passwd );
+               if( rc ) {
+                       rc = EXIT_FAILURE;
+                       goto done;
+               }
 
-       if(rc != LDAP_OPT_SUCCESS ) {
-               fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
-               return EXIT_FAILURE;
+       } else if ( want_bindpw ) {
+               passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
+               passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
        }
 
-       if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
-               if ( use_tls > 1 ) {
-                       ldap_perror( ld, "ldap_start_tls" );
-                       return( EXIT_FAILURE );
-               }
-               fprintf( stderr, "WARNING: could not start TLS\n" );
-       }
+       ld = tool_conn_setup( 0, 0 );
 
-       if ( authmethod == LDAP_AUTH_SASL ) {
-#ifdef HAVE_CYRUS_SASL
-               if( sasl_secprops != NULL ) {
-                       rc = ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS,
-                               (void *) sasl_secprops );
-                       
-                       if( rc != LDAP_OPT_SUCCESS ) {
-                               fprintf( stderr,
-                                       "Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n",
-                                       sasl_secprops );
-                               return( EXIT_FAILURE );
-                       }
-               }
-               
-               rc = ldap_sasl_interactive_bind_s( ld, binddn,
-                       sasl_mech, NULL, NULL, lutil_sasl_interact );
+       tool_bind( ld );
 
-               if( rc != LDAP_SUCCESS ) {
-                       ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
-                       return( EXIT_FAILURE );
-               }
-#else
-               fprintf( stderr, "%s was not compiled with SASL support\n",
-                       argv[0] );
-               return( EXIT_FAILURE );
-#endif
-       }
-       else {
-               if ( ldap_bind_s( ld, binddn, passwd.bv_val, authmethod )
-                               != LDAP_SUCCESS ) {
-                       ldap_perror( ld, "ldap_bind" );
-                       return( EXIT_FAILURE );
-               }
+       if ( assertion || authzid || manageDSAit || noop ) {
+               tool_server_controls( ld, NULL, 0 );
        }
 
-       if( dn != NULL || oldpw != NULL || newpw != NULL ) {
+       if( user != NULL || oldpw.bv_val != NULL || newpw.bv_val != NULL ) {
                /* build change password control */
-               BerElement *ber = ber_alloc_t( LBER_USE_DER );
+               ber = ber_alloc_t( LBER_USE_DER );
 
                if( ber == NULL ) {
                        perror( "ber_alloc_t" );
-                       ldap_unbind( ld );
-                       return EXIT_FAILURE;
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
 
                ber_printf( ber, "{" /*}*/ );
 
-               if( dn != NULL ) {
+               if( user != NULL ) {
                        ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID, dn );
-                       free(dn);
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_ID, user );
+                       free(user);
                }
 
-               if( oldpw != NULL ) {
-                       ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, oldpw );
-                       free(oldpw);
+               if( oldpw.bv_val != NULL ) {
+                       ber_printf( ber, "tO",
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, &oldpw );
+                       free(oldpw.bv_val);
                }
 
-               if( newpw != NULL ) {
-                       ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, newpw );
-                       free(newpw);
+               if( newpw.bv_val != NULL ) {
+                       ber_printf( ber, "tO",
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, &newpw );
+                       free(newpw.bv_val);
                }
 
                ber_printf( ber, /*{*/ "N}" );
 
-               rc = ber_flatten( ber, &bv );
+               rc = ber_flatten2( ber, &bv, 0 );
 
                if( rc < 0 ) {
-                       perror( "ber_flatten" );
-                       ldap_unbind( ld );
-                       return EXIT_FAILURE;
+                       perror( "ber_flatten2" );
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
-
-               ber_free( ber, 1 );
        }
 
-       if ( noupdates ) {
+       if ( not ) {
                rc = LDAP_SUCCESS;
-               goto skip;
+               goto done;
        }
 
        rc = ldap_extended_operation( ld,
-               LDAP_EXOP_X_MODIFY_PASSWD, bv
+               LDAP_EXOP_MODIFY_PASSWD, bv.bv_val ? &bv : NULL
                NULL, NULL, &id );
 
-       ber_bvfree( bv );
+       ber_free( ber, 1 );
 
        if( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_extended_operation" );
-               ldap_unbind( ld );
-               return EXIT_FAILURE;
+               rc = EXIT_FAILURE;
+               goto done;
        }
 
-       rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, NULL, &res );
-       if ( rc < 0 ) {
-               ldap_perror( ld, "ldappasswd: ldap_result" );
-               return rc;
+       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 ) {
+                       ldap_perror( ld, "ldappasswd: ldap_result" );
+                       return rc;
+               }
+
+               if ( rc != 0 ) {
+                       break;
+               }
        }
 
-       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 0 );
+       rc = ldap_parse_result( ld, res,
+               &code, &matcheddn, &text, &refs, NULL, 0 );
 
        if( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_parse_result" );
-               return rc;
+               rc = EXIT_FAILURE;
+               goto done;
        }
 
        rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
 
        if( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_parse_result" );
-               return rc;
+               rc = EXIT_FAILURE;
+               goto done;
        }
 
        if( retdata != NULL ) {
                ber_tag_t tag;
                char *s;
-               BerElement *ber = ber_init( retdata );
+               ber = ber_init( retdata );
 
                if( ber == NULL ) {
                        perror( "ber_init" );
-                       ldap_unbind( ld );
-                       return EXIT_FAILURE;
+                       rc = EXIT_FAILURE;
+                       goto done;
                }
 
                /* we should check the tag */
@@ -489,7 +377,7 @@ main( int argc, char *argv[] )
                if( tag == LBER_ERROR ) {
                        perror( "ber_scanf" );
                } else {
-                       printf("New password: %s\n", s);
+                       printf(_("New password: %s\n"), s);
                        free( s );
                }
 
@@ -497,20 +385,20 @@ main( int argc, char *argv[] )
        }
 
        if( verbose || code != LDAP_SUCCESS || matcheddn || text || refs ) {
-               printf( "Result: %s (%d)\n", ldap_err2string( code ), code );
+               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] );
                        }
                }
        }
@@ -521,9 +409,11 @@ main( int argc, char *argv[] )
        ber_memfree( retoid );
        ber_bvfree( retdata );
 
-skip:
-       /* disconnect from server */
-       ldap_unbind (ld);
+       rc = ( code == LDAP_SUCCESS ) ? EXIT_SUCCESS : EXIT_FAILURE;
 
-       return EXIT_SUCCESS;
+done:
+       /* disconnect from server */
+       tool_unbind( ld ); 
+       tool_destroy();
+       return rc;
 }