X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Flock.c;h=3ce58367d7ff9d4f201567875c1be80b7e32b272;hb=4abbf9c610d4fbaeee0dbdceaad1e0f94ed8e8fe;hp=d457cdfc21ae62aa655692e0bef074e06d05c21f;hpb=ef4fe3fc4b68289e34caea60db48f2fc2e1d5341;p=openldap

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index d457cdfc21..3ce58367d7 100644
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
+/* Portions Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,6 +22,10 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 /*
  * lock.c - routines to open and apply an advisory lock to a file
@@ -47,16 +59,11 @@ lock_fopen(
 	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 (( "lock", LDAP_LEVEL_ERR, "lock_fopen: "
-			"Error: could not open \"%s\"\n", buf ));
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"Error: could not open \"%s\"\n", buf, 0, 0 );
-#endif
 		return( NULL );
 	}
 
@@ -65,13 +72,8 @@ lock_fopen(
 
 	/* open the log file */
 	if ( (fp = fopen( fname, type )) == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG (( "lock", LDAP_LEVEL_ERR, "lock_fopen: "
-			"Error: could not open \"%s\"\n", fname ));
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"Error: could not open \"%s\"\n", fname, 0, 0 );
-#endif
 		ldap_unlockf( fileno(*lfp) );
 		fclose( *lfp );
 		*lfp = NULL;
@@ -89,11 +91,13 @@ lock_fclose(
     FILE	*lfp
 )
 {
+	int rc = fclose( fp );
+
 	/* unlock */
 	ldap_unlockf( fileno(lfp) );
 	fclose( lfp );
 
-	return( fclose( fp ) );
+	return( rc );
 }
 
 
@@ -109,15 +113,9 @@ acquire_lock(
 )
 {
     if (( *rfp = lock_fopen( file, "r+", lfp )) == NULL ) {
-#ifdef NEW_LOGGING
-	LDAP_LOG (( "lock", LDAP_LEVEL_ERR, "acquire_lock: "
-		"Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
-		(long) getpid(), file ));
-#else
 	Debug( LDAP_DEBUG_ANY,
 		"Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
 		(long) getpid(), file, 0);
-#endif
 	return( -1 );
     }
     return( 0 );
@@ -137,15 +135,9 @@ relinquish_lock(
 )
 {
     if ( lock_fclose( rfp, lfp ) == EOF ) {
-#ifdef NEW_LOGGING
-	LDAP_LOG (( "lock", LDAP_LEVEL_ERR, "relinguish_lock: "
-		"Error: relinquish_lock (%ld): Error closing \"%s\"\n",
-		(long) getpid(), file ));
-#else
 	Debug( LDAP_DEBUG_ANY,
 		"Error: relinquish_lock (%ld): Error closing \"%s\"\n",
 		(long) getpid(), file, 0 );
-#endif
 	return( -1 );
     }
     return( 0 );