From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 22 Oct 1998 05:03:43 +0000 (+0000)
Subject: More changes... but tests still fail.
X-Git-Tag: PHP3_TOOL_0_0~18^2~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8bf1d472e4263d29330cade18522f0406b9ef270;p=openldap

More changes... but tests still fail.
---

diff --git a/include/ac/syslog.h b/include/ac/syslog.h
index 76f8b35828..d5d4e26201 100644
--- a/include/ac/syslog.h
+++ b/include/ac/syslog.h
@@ -7,7 +7,9 @@
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 
-#if defined( LOG_NDELAY )
+#if defined( LOG_NDELAY ) && defined( LOG_NOWAIT )
+#	define OPENLOG_OPTIONS ( LOG_PID | LOG_NDELAY | LOG_NOWAIT )
+#elif defined( LOG_NDELAY )
 #	define OPENLOG_OPTIONS ( LOG_PID | LOG_NDELAY )
 #elif defined( LOG_NOWAIT )
 #	define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT )
diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index c0474e2023..4e9868cfe2 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -195,8 +195,10 @@ entry_free( Entry *e )
 	Attribute	*a, *next;
 
 	/* XXX check that no reader/writer locks exist */
+#ifdef DEBUG
 	assert( !pthread_rdwr_wchk_np(&e->e_rdwr) &&
 		!pthread_rdwr_rchk_np(&e->e_rdwr) );
+#endif
 
 	if ( e->e_dn != NULL ) {
 		free( e->e_dn );