X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flock.c;h=1a8fc52a5786a9b9f092cc258867c4588d276d95;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=b56a251fdcd131295bef6a2b344d4cd94894ef1c;hpb=bbcb0f8a7f7484c67c8d1aa49288601421269ddf;p=openldap
diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index b56a251fdc..1a8fc52a57 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,8 +1,27 @@
/* lock.c - routines to open and apply an advisory lock to a file */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
*/
#include "portable.h"
@@ -19,6 +38,7 @@
#endif
#include "slap.h"
+#include
FILE *
lock_fopen( const char *fname, const char *type, FILE **lfp )
@@ -27,14 +47,10 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
char buf[MAXPATHLEN];
/* open the lock file */
- strcpy(slap_strcopy( buf, fname ), ".lock" );
+ snprintf( buf, sizeof buf, "%s.lock", fname );
+
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 );
}
@@ -44,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", 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 );
@@ -63,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 );
}