Import ITS#3421 fix from HEAD - replog locking consistency

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index 7db26a764ce5c26c862b11697d8bad626d90ac54..67a0382d09132befabfa881f8273a40f09cdf649 100644 (file)
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -84,9 +84,11 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
 int
 lock_fclose( FILE *fp, FILE *lfp )
 {
+       int rc = fclose( fp );
+
        /* unlock */
        ldap_unlockf( fileno(lfp) );
        fclose( lfp );
 
-       return( fclose( fp ) );
+       return( rc );
 }

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index bce1e949781fd43b48a01a38f23e8fd23b1ae8b3..4ad7ac9c68a3baa612ff692f3056bd3be4abdb23 100644 (file)
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -101,11 +101,13 @@ lock_fclose(
     FILE       *lfp
 )
 {
+       int rc = fclose( fp );
+
        /* unlock */
        ldap_unlockf( fileno(lfp) );
        fclose( lfp );
 
-       return( fclose( fp ) );
+       return( rc );
 }