Import minor trace output cleanup

[openldap] / servers / slapd / lock.c

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index 305fb5b91ce0d346275ad6faf836fbd13d8d4b97..f634b220aa3026518a5e849b037b0a5c38df7dc8 100644 (file)
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,15 +1,16 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
 
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include "portable.h"
-#ifdef USE_LOCKF
-#include <unistd.h>
-#endif
+
+#include <stdio.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+
 #include <sys/file.h>
 #include <sys/param.h>
-#include <sys/socket.h>
 #include "slap.h"
 
 FILE *
@@ -27,10 +28,10 @@ lock_fopen( char *fname, char *type, FILE **lfp )
        }
 
        /* acquire the lock */
-#ifdef USE_LOCKF
-       while ( lockf( fileno( *lfp ), F_LOCK, 0 ) != 0 ) {
-#else
+#ifdef HAVE_FLOCK
        while ( flock( fileno( *lfp ), LOCK_EX ) != 0 ) {
+#else
+       while ( lockf( fileno( *lfp ), F_LOCK, 0 ) != 0 ) {
 #endif
                ;       /* NULL */
        }
@@ -38,11 +39,13 @@ lock_fopen( char *fname, char *type, FILE **lfp )
        /* open the log file */
        if ( (fp = fopen( fname, type )) == NULL ) {
                Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
-#ifdef USE_LOCKF
-               lockf( fileno( *lfp ), F_ULOCK, 0 );
-#else
+#ifdef HAVE_FLOCK
                flock( fileno( *lfp ), LOCK_UN );
+#else
+               lockf( fileno( *lfp ), F_ULOCK, 0 );
 #endif
+               fclose( *lfp );
+               *lfp = NULL;
                return( NULL );
        }
 
@@ -53,10 +56,10 @@ int
 lock_fclose( FILE *fp, FILE *lfp )
 {
        /* unlock */
-#ifdef USE_LOCKF
-       lockf( fileno( lfp ), F_ULOCK, 0 );
-#else
+#ifdef HAVE_FLOCK
        flock( fileno( lfp ), LOCK_UN );
+#else
+       lockf( fileno( lfp ), F_ULOCK, 0 );
 #endif
        fclose( lfp );