From: Julius Enarusai <julius@openldap.org>
Date: Mon, 15 Apr 2002 19:16:32 +0000 (+0000)
Subject: Added LDAP_LOG Messages
X-Git-Tag: OPENLDAP_REL_ENG_2_MP~204
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ef4fe3fc4b68289e34caea60db48f2fc2e1d5341;p=openldap

Added LDAP_LOG Messages
---

diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index 681ac4943e..d457cdfc21 100644
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -50,8 +50,13 @@ lock_fopen(
 	strcpy( buf, fname );
 	strcat( buf, ".lock" );
 	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 );
 	}
 
@@ -60,8 +65,13 @@ 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;
@@ -99,9 +109,15 @@ 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 );
@@ -121,9 +137,15 @@ 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 );