/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
snprintf( buf, sizeof buf, "%s.lock", fname );
if ( (*lfp = fopen( buf, "w" )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
- "Error: could not open \"%s\"\n", buf, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"Error: could not open \"%s\"\n", buf, 0, 0 );
-#endif
return( NULL );
}
/* open the log file */
if ( (fp = fopen( fname, type )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, ERR, "lock_fopen: "
- "Error: could not open \"%s\"\n", fname, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"Error: could not open \"%s\"\n", fname, 0, 0 );
-#endif
ldap_unlockf( fileno(*lfp) );
fclose( *lfp );
*lfp = NULL;
FILE *lfp
)
{
+ int rc = fclose( fp );
+
/* unlock */
ldap_unlockf( fileno(lfp) );
fclose( lfp );
- return( fclose( fp ) );
+ return( rc );
}
)
{
if (( *rfp = lock_fopen( file, "r+", lfp )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, ERR, "acquire_lock: "
- "Error: acquire_lock(%ld): Could not acquire lock on \"%s\"\n",
- (long) getpid(), file, 0 );
-#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 );
)
{
if ( lock_fclose( rfp, lfp ) == EOF ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( SLURPD, ERR, "relinguish_lock: "
- "Error: relinquish_lock (%ld): Error closing \"%s\"\n",
- (long) getpid(), file, 0 );
-#else
Debug( LDAP_DEBUG_ANY,
"Error: relinquish_lock (%ld): Error closing \"%s\"\n",
(long) getpid(), file, 0 );
-#endif
return( -1 );
}
return( 0 );