X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flock.c;h=d19cc646f02c48899d75626baef2b8536c1383db;hb=a720011c8a05d610c737c4e7e299b03506ce810f;hp=8aee42baa24bb8d6892279f5f23497a88d0cea8e;hpb=4e15a84452f0493b1b5bc7b779c7bd1cd4fa4b73;p=openldap

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index 8aee42baa2..d19cc646f0 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,12 +50,7 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
 	snprintf( buf, sizeof buf, "%s.lock", fname );
 
 	if ( (*lfp = fopen( buf, "w" )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"lock_fopen: could not open lock file \"%s\".\n", buf, 0, 0);
-#else
 		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", buf, 0, 0 );
-#endif
 
 		return( NULL );
 	}
@@ -65,12 +60,7 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
 
 	/* open the log file */
 	if ( (fp = fopen( fname, type )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"lock_fopen: could not open log file \"%s\".\n", buf, 0, 0);
-#else
 		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
-#endif
 
 		ldap_unlockf( fileno(*lfp) );
 		fclose( *lfp );
@@ -84,9 +74,10 @@ 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 );
 }