From: Howard Chu <hyc@openldap.org>
Date: Wed, 12 Jan 2005 03:17:21 +0000 (+0000)
Subject: Import ITS#3421 fix from HEAD - replog locking consistency
X-Git-Tag: OPENLDAP_REL_ENG_2_2_21~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=509990a95b017e20acfceab2c84c836d28bf8d8d;p=openldap

Import ITS#3421 fix from HEAD - replog locking consistency
---

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index 7db26a764c..67a0382d09 100644
--- 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 bce1e94978..4ad7ac9c68 100644
--- 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 );
 }