X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flock.c;h=4688b50e3d2f35ab51a5899e57a10fd9fbdcdbb6;hb=9184d038ead9aeabff5b7c0bb2ed0d1e6bc95c8c;hp=aee7c31cfb3597073bb18e396c113f700b1b09e2;hpb=6c6d3d8f0c1288ed37981b8b30b18a6f9429b9fa;p=openldap

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index aee7c31cfb..4688b50e3d 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,48 +1,61 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
-#include <sys/param.h>
+#endif
+
 #include "slap.h"
+#include <lutil.h>
 
 FILE *
-lock_fopen( char *fname, char *type, FILE **lfp )
+lock_fopen( const char *fname, const char *type, FILE **lfp )
 {
 	FILE	*fp;
 	char	buf[MAXPATHLEN];
 
 	/* open the lock file */
-	strcpy( buf, fname );
-	strcat( buf, ".lock" );
+	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 );
 	}
 
 	/* acquire the lock */
-#ifdef HAVE_FLOCK
-	while ( flock( fileno( *lfp ), LOCK_EX ) != 0 ) {
-#else
-	while ( lockf( fileno( *lfp ), F_LOCK, 0 ) != 0 ) {
-#endif
-		;	/* NULL */
-	}
+	ldap_lockf( fileno(*lfp) );
 
 	/* open the log file */
 	if ( (fp = fopen( fname, type )) == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
-#ifdef HAVE_FLOCK
-		flock( fileno( *lfp ), LOCK_UN );
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, 
+			"lock_fopen: could not open log file \"%s\".\n", buf, 0, 0);
 #else
-		lockf( fileno( *lfp ), F_ULOCK, 0 );
+		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
 #endif
+
+		ldap_unlockf( fileno(*lfp) );
+		fclose( *lfp );
+		*lfp = NULL;
 		return( NULL );
 	}
 
@@ -53,11 +66,7 @@ int
 lock_fclose( FILE *fp, FILE *lfp )
 {
 	/* unlock */
-#ifdef USE_LOCKF
-	lockf( fileno( lfp ), F_ULOCK, 0 );
-#else
-	flock( fileno( lfp ), LOCK_UN );
-#endif
+	ldap_unlockf( fileno(lfp) );
 	fclose( lfp );
 
 	return( fclose( fp ) );