libevent 2.0 support

diff --git a/servers/lloadd/daemon.c b/servers/lloadd/daemon.c
index e47ea567c2bbf2d59daf29440a88186f44250d1c..841d423e641b6761f2aa7cef87ac8372d456e35a 100644 (file)
--- a/servers/lloadd/daemon.c
+++ b/servers/lloadd/daemon.c
@@ -1302,9 +1302,11 @@ lloadd_daemon( struct event_base *daemon_base )
 
     assert( daemon_base != NULL );
 
-    dnsbase = evdns_base_new( daemon_base,
-            EVDNS_BASE_INITIALIZE_NAMESERVERS |
-                    EVDNS_BASE_DISABLE_WHEN_INACTIVE );
+#ifndef EVDNS_BASE_INITIALIZE_NAMESERVERS /* libevent 2.0 support */
+#define EVDNS_BASE_INITIALIZE_NAMESERVERS 1
+#endif /* !EVDNS_BASE_INITIALIZE_NAMESERVERS */
+
+    dnsbase = evdns_base_new( daemon_base, EVDNS_BASE_INITIALIZE_NAMESERVERS );
     if ( !dnsbase ) {
         Debug( LDAP_DEBUG_ANY, "lloadd startup: "
                 "failed to set up for async name resolution\n" );
@@ -1358,7 +1360,7 @@ lloadd_daemon( struct event_base *daemon_base )
         }
     }
 
-    event = evtimer_new( daemon_base, operations_timeout, event_self_cbarg() );
+    event = evtimer_new( daemon_base, operations_timeout, NULL );
     if ( !event ) {
         Debug( LDAP_DEBUG_ANY, "lloadd: "
                 "failed to allocate timeout event\n" );

diff --git a/servers/lloadd/libevent_support.c b/servers/lloadd/libevent_support.c
index 9ba4974a47d4e542a4bf82bea0aee4b2bbc2f77b..9a70d8110ac4087503a3dfa377c0962284f51a65 100644 (file)
--- a/servers/lloadd/libevent_support.c
+++ b/servers/lloadd/libevent_support.c
@@ -167,5 +167,7 @@ lload_libevent_init( void )
 void
 lload_libevent_destroy( void )
 {
+#if ( EVENT__NUMERIC_VERSION >= 0x02010000 )
     libevent_global_shutdown();
+#endif
 }

diff --git a/servers/lloadd/operation.c b/servers/lloadd/operation.c
index 6564ecdfaf0981ffe9f3b71cf1a73d9cff501982..1946dc66531b381c956471689381c55b8c757b9c 100644 (file)
--- a/servers/lloadd/operation.c
+++ b/servers/lloadd/operation.c
@@ -983,7 +983,6 @@ backend_timeout(
 void
 operations_timeout( evutil_socket_t s, short what, void *arg )
 {
-    struct event *self = arg;
     LloadBackend *b;
     time_t threshold;
 
@@ -1009,7 +1008,7 @@ operations_timeout( evutil_socket_t s, short what, void *arg )
 done:
     Debug( LDAP_DEBUG_TRACE, "operations_timeout: "
             "timeout task finished\n" );
-    evtimer_add( self, lload_timeout_api );
+    evtimer_add( lload_timeout_event, lload_timeout_api );
 }
 
 void