reject registrations when back-monitor is not configured

[openldap] / servers / slapd / daemon.c

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 3b93244c3723eab5e42beb7c1c389fb67cceaeda..a0125a19fc1248ba7f919d56d4112b8515d75805 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -40,8 +40,6 @@
 
 #include "ldap_rq.h"
 
-#undef HAVE_EPOLL
-
 #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL)
 #include <sys/epoll.h>
 #endif
@@ -206,7 +204,7 @@ static struct slap_daemon {
 #define SLAP_EVENT_FD(i)       SLAP_EV_PTRFD(revents[i].data.ptr)
 #define        SLAP_SOCK_SET_MUTE(s)   SLAP_SOCK_CLR_READ(s)
 #define        SLAP_SOCK_CLR_MUTE(s)   SLAP_SOCK_SET_READ(s)
-#define        SLAP_SOCK_IS_MUTE(s)    !SLAP_SOCK_IS_READ(s)
+#define        SLAP_SOCK_IS_MUTE(s)    (!SLAP_SOCK_IS_READ(s))
 
 #define SLAP_SOCK_SET_INIT     \
        slap_daemon.sd_epolls = ch_malloc(sizeof(struct epoll_event) * dtblsize * 2);   \
@@ -301,7 +299,7 @@ static struct slap_daemon {
 
 #define        SLAP_SOCK_SET_MUTE(s)   FD_CLR(s, &readfds)
 #define SLAP_SOCK_CLR_MUTE(s)  FD_SET(s, &readfds)
-#define        SLAP_SOCK_IS_MUTE(s)    FD_ISSET(s, &readfds)
+#define        SLAP_SOCK_IS_MUTE(s)    (!FD_ISSET(s, &readfds))
 
 #endif
 
@@ -558,9 +556,9 @@ static int get_url_perms(
 {
        int     i;
 
-       assert( exts );
-       assert( perms );
-       assert( crit );
+       assert( exts != NULL );
+       assert( perms != NULL );
+       assert( crit != NULL );
 
        *crit = 0;
        for ( i = 0; exts[ i ]; i++ ) {
@@ -1005,16 +1003,6 @@ static int slap_open_listener(
 #ifdef LDAP_PF_LOCAL
        case AF_LOCAL: {
                char *addr = ((struct sockaddr_un *)*sal)->sun_path;
-#if 0 /* don't muck with socket perms */
-               if ( chmod( addr, l.sl_perms ) < 0 && crit ) {
-                       int err = sock_errno();
-                       Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
-                              (long) l.sl_sd, err, sock_errstr(err) );
-                       tcp_close( l.sl_sd );
-                       slap_free_listener_addresses(psal);
-                       return -1;
-               }
-#endif
                l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1;
                l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 );
                snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, 
@@ -1584,7 +1572,10 @@ slapd_daemon_task(
                ber_socket_t i;
                int ns, nwriters;
                int at;
-               ber_socket_t nfds, nrfds, nwfds;
+               ber_socket_t nfds;
+#if SLAP_EVENTS_ARE_INDEXED
+               ber_socket_t nrfds, nwfds;
+#endif
 #define SLAPD_EBADF_LIMIT 16
 
                time_t  now;
@@ -1768,8 +1759,6 @@ slapd_daemon_task(
                        if ( !SLAP_EVENT_IS_READ( slap_listeners[l]->sl_sd ))
                                continue;
                        
-                       ns--;
-
                        rc = slapd_handle_listener(slap_listeners[l]);
 
 #ifdef LDAP_CONNECTIONLESS
@@ -1777,6 +1766,8 @@ slapd_daemon_task(
                        if ( rc ) continue;
 #endif
 
+                       ns--;
+
                        /* Don't need to look at this in the data loops */
                        SLAP_EVENT_CLR_READ( slap_listeners[l]->sl_sd );
                        SLAP_EVENT_CLR_WRITE( slap_listeners[l]->sl_sd );
@@ -1927,6 +1918,10 @@ slapd_daemon_task(
 #endif
                         ) continue;
 
+                       /* Don't log internal wake events */
+                       if ( SLAP_EVENT_FD( i ) == wake_sds[0] )
+                               continue;
+
                        r = SLAP_EVENT_IS_READ( i );
                        w = SLAP_EVENT_IS_WRITE( i );
                        if ( r || w ) {
@@ -1948,6 +1943,10 @@ slapd_daemon_task(
                        if ( rc ) {
                                fd = SLAP_EVENT_FD( i );
 
+                               /* Ignore wake events, they were handled above */
+                               if ( fd == wake_sds[0] )
+                                       continue;
+
                                if( SLAP_EVENT_IS_WRITE( i ) ) {
                                        Debug( LDAP_DEBUG_CONNS,
                                                "daemon: write active on %d\n",
@@ -2013,9 +2012,6 @@ slapd_daemon_task(
                close_listeners ( 0 );
        }
 
-       free ( slap_listeners );
-       slap_listeners = NULL;
-
        if( !slapd_gentle_shutdown ) {
                slapd_abrupt_shutdown = 1;
                connections_shutdown();
@@ -2026,6 +2022,9 @@ slapd_daemon_task(
            ldap_pvt_thread_pool_backload(&connection_pool), 0, 0 );
        ldap_pvt_thread_pool_destroy(&connection_pool, 1);
 
+       free ( slap_listeners );
+       slap_listeners = NULL;
+
        return NULL;
 }
 
@@ -2063,7 +2062,7 @@ int slapd_daemon( void )
 
 }
 
-int sockinit(void)
+static int sockinit(void)
 {
 #if defined( HAVE_WINSOCK2 )
     WORD wVersionRequested;
@@ -2104,7 +2103,7 @@ int sockinit(void)
        return 0;
 }
 
-int sockdestroy(void)
+static int sockdestroy(void)
 {
 #if defined( HAVE_WINSOCK2 ) || defined( HAVE_WINSOCK )
        WSACleanup();