More changes... but tests still fail.

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 )

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 );