Commit 509990a9 authored by Howard Chu's avatar Howard Chu
Browse files

Import ITS#3421 fix from HEAD - replog locking consistency

parent cddab86f
...@@ -84,9 +84,11 @@ lock_fopen( const char *fname, const char *type, FILE **lfp ) ...@@ -84,9 +84,11 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
int int
lock_fclose( FILE *fp, FILE *lfp ) lock_fclose( FILE *fp, FILE *lfp )
{ {
int rc = fclose( fp );
/* unlock */ /* unlock */
ldap_unlockf( fileno(lfp) ); ldap_unlockf( fileno(lfp) );
fclose( lfp ); fclose( lfp );
return( fclose( fp ) ); return( rc );
} }
...@@ -101,11 +101,13 @@ lock_fclose( ...@@ -101,11 +101,13 @@ lock_fclose(
FILE *lfp FILE *lfp
) )
{ {
int rc = fclose( fp );
/* unlock */ /* unlock */
ldap_unlockf( fileno(lfp) ); ldap_unlockf( fileno(lfp) );
fclose( lfp ); fclose( lfp );
return( fclose( fp ) ); return( rc );
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment