/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 1998-2001 Net Boolean Incorporated.
* Portions Copyright 2001-2003 IBM Corporation.
* from this software without specific prior written permission. This
* software is provided ``as is'' without express or implied warranty.
*/
-/* The original ldappasswd(1) tool was developed by Dave Storey (F5
+/* 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).
{
fprintf( stderr, _("Change password of an LDAP user\n\n"));
fprintf( stderr,_("usage: %s [options] [user]\n"), prog);
- fprintf( stderr, _(" user: the autentication identity, commonly a DN\n"));
+ 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"));
const char options[] = "a:As:St:T:"
- "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 )
{
switch ( i ) {
#if 0
- case 'E': /* passwd controls */ {
+ case 'E': /* passwd extensions */ {
int crit;
char *control, *cvalue;
if( protocol == LDAP_VERSION2 ) {
if ( (cvalue = strchr( control, '=' )) != NULL ) {
*cvalue++ = '\0';
}
- fprintf( stderr, _("Invalid passwd control name: %s\n"), control );
+ fprintf( stderr, _("Invalid passwd extension name: %s\n"), control );
usage();
}
#endif
char *matcheddn = NULL, *text = NULL, **refs = NULL;
char *retoid = NULL;
struct berval *retdata = NULL;
+ LDAPControl **ctrls = NULL;
- tool_init();
+ tool_init( TOOL_PASSWD );
prog = lutil_progname( "ldappasswd", argc, argv );
/* LDAPv3 only */
if( oldpwfile ) {
rc = lutil_get_filed_password( oldpwfile, &oldpw );
- if( rc ) return EXIT_FAILURE;
+ if( rc ) {
+ rc = EXIT_FAILURE;
+ goto done;
+ }
}
if( want_oldpw && oldpw.bv_val == NULL ) {
strcmp( oldpw.bv_val, ckoldpw ))
{
fprintf( stderr, _("passwords do not match\n") );
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ goto done;
}
oldpw.bv_len = strlen( oldpw.bv_val );
if( newpwfile ) {
rc = lutil_get_filed_password( newpwfile, &newpw );
- if( rc ) return EXIT_FAILURE;
+ if( rc ) {
+ rc = EXIT_FAILURE;
+ goto done;
+ }
}
if( want_newpw && newpw.bv_val == NULL ) {
strcmp( newpw.bv_val, cknewpw ))
{
fprintf( stderr, _("passwords do not match\n") );
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ goto done;
}
newpw.bv_len = strlen( newpw.bv_val );
}
- if ( pw_file ) {
- rc = lutil_get_filed_password( pw_file, &passwd );
- if( rc ) 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;
- }
-
ld = tool_conn_setup( 0, 0 );
tool_bind( ld );
- if ( assertion || authzid || manageDSAit || noop ) {
- tool_server_controls( ld, NULL, 0 );
- }
-
if( user != NULL || oldpw.bv_val != NULL || newpw.bv_val != NULL ) {
- /* build change password control */
+ /* build the password modify request data */
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( rc < 0 ) {
perror( "ber_flatten2" );
- ldap_unbind( ld );
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ goto done;
}
}
- if ( not ) {
+ if ( dont ) {
rc = LDAP_SUCCESS;
- goto skip;
+ goto done;
}
+ tool_server_controls( ld, NULL, 0);
+
rc = ldap_extended_operation( ld,
LDAP_EXOP_MODIFY_PASSWD, bv.bv_val ? &bv : NULL,
NULL, NULL, &id );
ber_free( ber, 1 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_extended_operation" );
- ldap_unbind( ld );
- return EXIT_FAILURE;
+ tool_perror( "ldap_extended_operation", rc, NULL, NULL, NULL, NULL );
+ 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 ) ) {
+ 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 ( rc != 0 ) {
+ break;
+ }
}
rc = ldap_parse_result( ld, res,
- &code, &matcheddn, &text, &refs, NULL, 0 );
-
+ &code, &matcheddn, &text, &refs, &ctrls, 0 );
if( rc != LDAP_SUCCESS ) {
- ldap_perror( ld, "ldap_parse_result" );
- return rc;
+ tool_perror( "ldap_parse_result", rc, NULL, NULL, NULL, NULL );
+ 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;
+ tool_perror( "ldap_parse_extended_result", rc, NULL, NULL, NULL, NULL );
+ rc = EXIT_FAILURE;
+ goto done;
}
if( retdata != NULL ) {
if( ber == NULL ) {
perror( "ber_init" );
- ldap_unbind( ld );
- return EXIT_FAILURE;
+ rc = EXIT_FAILURE;
+ goto done;
}
/* we should check the tag */
perror( "ber_scanf" );
} else {
printf(_("New password: %s\n"), s);
- free( s );
+ ber_memfree( s );
}
ber_free( ber, 1 );
+
+ } else if ( code == LDAP_SUCCESS && newpw.bv_val == NULL ) {
+ tool_perror( "ldap_parse_extended_result", LDAP_DECODING_ERROR,
+ " new password expected", NULL, NULL, NULL );
}
- if( verbose || code != LDAP_SUCCESS || matcheddn || text || refs ) {
+ if( verbose || code != LDAP_SUCCESS ||
+ ( matcheddn && *matcheddn ) || ( text && *text ) || refs || ctrls )
+ {
printf( _("Result: %s (%d)\n"), ldap_err2string( code ), code );
if( text && *text ) {
printf(_("Referral: %s\n"), refs[i] );
}
}
+
+ if( ctrls ) {
+ tool_print_ctrls( ld, ctrls );
+ ldap_controls_free( ctrls );
+ }
}
ber_memfree( text );
ber_memfree( retoid );
ber_bvfree( retdata );
-skip:
- /* disconnect from server */
- ldap_unbind (ld);
+ rc = ( code == LDAP_SUCCESS ) ? EXIT_SUCCESS : EXIT_FAILURE;
- return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
+done:
+ /* disconnect from server */
+ tool_exit( ld, rc );
}
projects / openldap / blobdiff