X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flock.c;h=bc8a4fc8a4089b4b28f2a92b248d155a7d90b67c;hb=804490a8b12a94a19e7c1a8710a7d8a2fb7d5477;hp=e9f5fda164383f1948fd6279e831ea324d2b8c59;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index e9f5fda164..bc8a4fc8a4 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,7 +1,7 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -17,9 +17,7 @@
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
+
 #include "slap.h"
 
 FILE *
@@ -29,10 +27,15 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
 	char	buf[MAXPATHLEN];
 
 	/* open the lock file */
-	strcpy( buf, fname );
-	strcat( buf, ".lock" );
+	strcpy(slap_strcopy( buf, fname ), ".lock" );
 	if ( (*lfp = fopen( buf, "w" )) == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "lock_fopen: could not open lock file \"%s\".\n", buf ));
+#else
 		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", buf, 0, 0 );
+#endif
+
 		return( NULL );
 	}
 
@@ -41,7 +44,13 @@ 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", LDAP_LEVEL_ERR,
+			   "lock_fopen: could not open log file \"%s\".\n", buf ));
+#else
 		Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
+#endif
+
 		ldap_unlockf( fileno(*lfp) );
 		fclose( *lfp );
 		*lfp = NULL;