mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

free LDIF handler in case of failure

Browse Source
This commit is contained in:
Pierangelo Masarati 2010-04-12 03:42:29 +00:00
parent 86c361cdb8
commit 3a46af398c
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clients/tools/ldapmodify.c
View File

@ -239,7 +239,8 @@ main( int argc, char **argv )
if ( rejfile != NULL ) { if ( rejfile != NULL ) {
if (( rejfp = fopen( rejfile, "w" )) == NULL ) { if (( rejfp = fopen( rejfile, "w" )) == NULL ) {
perror( rejfile ); perror( rejfile );
return( EXIT_FAILURE ); retval = EXIT_FAILURE;
goto fail;
} }
} else { } else {
rejfp = NULL; rejfp = NULL;
@ -248,7 +249,8 @@ main( int argc, char **argv )
if ( infile != NULL ) { if ( infile != NULL ) {
if (( ldiffp = ldif_open( infile, "r" )) == NULL ) { if (( ldiffp = ldif_open( infile, "r" )) == NULL ) {
perror( infile ); perror( infile );
return( EXIT_FAILURE ); retval = EXIT_FAILURE;
goto fail;
} }
} else { } else {
ldifdummy.fp = stdin; ldifdummy.fp = stdin;
@ -263,7 +265,10 @@ main( int argc, char **argv )
if ( pw_file || want_bindpw ) { if ( pw_file || want_bindpw ) {
if ( pw_file ) { if ( pw_file ) {
rc = lutil_get_filed_password( pw_file, &passwd ); rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE; if ( rc ) {
retval = EXIT_FAILURE;
goto fail;
}
} else { } else {
passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") ); passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0; passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
@ -278,7 +283,10 @@ main( int argc, char **argv )
rc = ldap_txn_start_s( ld, NULL, NULL, &txn_id ); rc = ldap_txn_start_s( ld, NULL, NULL, &txn_id );
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
tool_perror( "ldap_txn_start_s", rc, NULL, NULL, NULL, NULL ); tool_perror( "ldap_txn_start_s", rc, NULL, NULL, NULL, NULL );
if( txn > 1 ) return EXIT_FAILURE; if( txn > 1 ) {
retval = EXIT_FAILURE;
goto fail;
}
txn = 0; txn = 0;
} }
} }
@ -312,7 +320,8 @@ main( int argc, char **argv )
len = strlen( rbuf ); len = strlen( rbuf );
if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) { if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) {
perror( "malloc" ); perror( "malloc" );
exit( EXIT_FAILURE ); retval = EXIT_FAILURE;
goto fail;
} }
memcpy( rejbuf, rbuf, len+1 ); memcpy( rejbuf, rbuf, len+1 );
} }
@ -367,15 +376,21 @@ main( int argc, char **argv )
} }
#endif #endif
if ( !dont ) { if ( !dont && ld != NULL ) {
tool_unbind( ld ); tool_unbind( ld );
} }
tool_destroy();
fail:;
if ( rejfp != NULL ) { if ( rejfp != NULL ) {
fclose( rejfp ); fclose( rejfp );
} }
tool_destroy(); if ( ldiffp != NULL && ldiffp != &ldifdummy ) {
ldif_close( ldiffp );
}
return( retval ); return( retval );
} }