More changes... but tests still fail.

diff --git a/include/ac/syslog.h b/include/ac/syslog.h
index 76f8b35828fbb82d7a2d2db89dabda37821e75de..d5d4e26201fbe9266ac4b22503a27d9ac0cf2215 100644 (file)
--- 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 c0474e20238eded3a92d3bce734e248856d8e924..4e9868cfe273410cf65c4f4993fecef275c9f311 100644 (file)
--- 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 );