mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#3620: Initial Unbind control fix

Browse Source 
A better fix would be to use the _ext interface
Also add and use a tool_destroy() function (to destroy SASL/TLS contexts).
This commit is contained in:
Kurt Zeilenga 2005-04-01 23:29:02 +00:00
parent 592c4ad2b0
commit c57f440118
9 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clients/tools/common.c
View File

@ -97,6 +97,17 @@ tool_init( void )
ldap_pvt_textdomain(OPENLDAP_PACKAGE);
}
void
tool_destroy( void )
{
#ifdef HAVE_CYRUS_SASL
sasl_done();
#endif
#ifdef HAVE_TLS
ldap_pvt_tls_destroy();
#endif
}
void
tool_common_usage( void )
{
@ -918,6 +929,18 @@ tool_bind( LDAP *ld )
}
}
void
tool_unbind( LDAP *ld )
{
int err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, NULL );
if ( err != LDAP_OPT_SUCCESS ) {
fprintf( stderr, "Could not unset controls\n");
}
(void) ldap_unbind_ext( ld, NULL, NULL );
}
/* Set server controls. Add controls extra_c[0..count-1], if set. */
void

2
clients/tools/common.h
View File

@ -77,6 +77,8 @@ void tool_common_usage LDAP_P(( void ));
void tool_args LDAP_P(( int, char ** ));
LDAP *tool_conn_setup LDAP_P(( int dont, void (*private_setup)( LDAP * ) ));
void tool_bind LDAP_P(( LDAP * ));
void tool_unbind LDAP_P(( LDAP * ));
void tool_destroy LDAP_P(( void ));
void tool_server_controls LDAP_P(( LDAP *, LDAPControl *, int ));
LDAP_END_DECL

4
clients/tools/ldapcompare.c
View File

@ -217,8 +217,8 @@ main( int argc, char **argv )
free( bvalue.bv_val );
ldap_unbind_ext( ld, NULL, NULL );
tool_unbind( ld );
tool_destroy();
return rc;
}

6
clients/tools/ldapdelete.c
View File

@ -197,9 +197,9 @@ main( int argc, char **argv )
}
}
ldap_unbind_ext( ld, NULL, NULL );
return( retval );
tool_unbind( ld );
tool_destroy();
return retval;
}

3
clients/tools/ldapmodify.c
View File

@ -405,13 +405,14 @@ main( int argc, char **argv )
#endif
if ( !not ) {
ldap_unbind_ext( ld, NULL, NULL );
tool_unbind( ld );
}
if ( rejfp != NULL ) {
fclose( rejfp );
}
tool_destroy();
return( retval );
}

4
clients/tools/ldapmodrdn.c
View File

@ -227,8 +227,8 @@ main(int argc, char **argv)
}
}
ldap_unbind_ext( ld, NULL, NULL );
tool_unbind( ld );
tool_destroy();
return( retval );
}

58
clients/tools/ldappasswd.c
View File

@ -196,7 +196,10 @@ main( int argc, char *argv[] )
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 ) {
@ -209,7 +212,8 @@ main( int argc, char *argv[] )
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 );
@ -217,7 +221,10 @@ main( int argc, char *argv[] )
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 ) {
@ -230,7 +237,8 @@ main( int argc, char *argv[] )
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 );
@ -238,7 +246,10 @@ main( int argc, char *argv[] )
if ( pw_file ) {
rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE;
if( rc ) {
rc = EXIT_FAILURE;
goto done;
}
} else if ( want_bindpw ) {
passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
@ -259,8 +270,8 @@ main( int argc, char *argv[] )
if( ber == NULL ) {
perror( "ber_alloc_t" );
ldap_unbind_ext( ld, NULL, NULL );
return EXIT_FAILURE;
rc = EXIT_FAILURE;
goto done;
}
ber_printf( ber, "{" /*}*/ );
@ -289,14 +300,14 @@ main( int argc, char *argv[] )
if( rc < 0 ) {
perror( "ber_flatten2" );
ldap_unbind_ext( ld, NULL, NULL );
return EXIT_FAILURE;
rc = EXIT_FAILURE;
goto done;
}
}
if ( not ) {
rc = LDAP_SUCCESS;
goto skip;
goto done;
}
rc = ldap_extended_operation( ld,
@ -307,14 +318,15 @@ main( int argc, char *argv[] )
if( rc != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_extended_operation" );
ldap_unbind_ext( ld, NULL, NULL );
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;
rc = EXIT_FAILURE;
goto done;
}
rc = ldap_parse_result( ld, res,
@ -322,14 +334,16 @@ main( int argc, char *argv[] )
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 ) {
@ -339,8 +353,8 @@ main( int argc, char *argv[] )
if( ber == NULL ) {
perror( "ber_init" );
ldap_unbind_ext( ld, NULL, NULL );
return EXIT_FAILURE;
rc = EXIT_FAILURE;
goto done;
}
/* we should check the tag */
@ -381,9 +395,11 @@ main( int argc, char *argv[] )
ber_memfree( retoid );
ber_bvfree( retdata );
skip:
/* disconnect from server */
ldap_unbind_ext( ld, NULL, NULL );
rc = ( code == LDAP_SUCCESS ) ? EXIT_SUCCESS : EXIT_FAILURE;
return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
done:
/* disconnect from server */
tool_unbind( ld );
tool_destroy();
return rc;
}

12
clients/tools/ldapsearch.c
View File

@ -363,6 +363,7 @@ handle_private_option( int i )
domainScope = 1 + crit;
#endif
#ifdef LDAP_CONTROL_SUBENTRIES
} else if ( strcasecmp( control, "subentries" ) == 0 ) {
if( subentries ) {
@ -708,7 +709,7 @@ getNextPage:
}
err = ber_printf( seber, "b", abs(subentries) == 1 ? 0 : 1 );
if ( err == -1 ) {
if ( err == -1 ) {
ber_free( seber, 1 );
fprintf( stderr, _("Subentries control encoding error!\n") );
return EXIT_FAILURE;
@ -942,13 +943,8 @@ getNextPage:
}
#endif
ldap_unbind_ext( ld, NULL, NULL );
#ifdef HAVE_CYRUS_SASL
sasl_done();
#endif
#ifdef HAVE_TLS
ldap_pvt_tls_destroy();
#endif
tool_unbind( ld );
tool_destroy();
return( rc );
}

3
clients/tools/ldapwhoami.c
View File

@ -193,7 +193,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;
}