diff options
| -rw-r--r-- | source4/lib/events/configure.ac | 1 | ||||
| -rw-r--r-- | source4/lib/events/libevents.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb.i | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_wrap.c | 5 |
5 files changed, 13 insertions, 7 deletions
diff --git a/source4/lib/events/configure.ac b/source4/lib/events/configure.ac index 26efe82ba4..fbd23b10e5 100644 --- a/source4/lib/events/configure.ac +++ b/source4/lib/events/configure.ac @@ -7,7 +7,6 @@ AC_INIT(events, 1.0.0) AC_CONFIG_SRCDIR([events.c]) AC_CONFIG_HEADER(config.h) AC_LIBREPLACE_ALL_CHECKS -AC_LIBREPLACE_NETWORK_CHECKS m4_include(libtalloc.m4) diff --git a/source4/lib/events/libevents.m4 b/source4/lib/events/libevents.m4 index be3f1bb638..552dc7c43e 100644 --- a/source4/lib/events/libevents.m4 +++ b/source4/lib/events/libevents.m4 @@ -14,6 +14,7 @@ if test x"$eventsdir" = "x"; then fi EVENTS_OBJ="events.o events_select.o events_signal.o events_timed.o events_standard.o events_debug.o events_util.o" +AC_LIBREPLACE_NETWORK_CHECKS SMB_ENABLE(EVENTS_EPOLL, NO) SMB_ENABLE(EVENTS_AIO, NO) diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index a53c5542da..ecb6b6516b 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -11,7 +11,7 @@ includedir = @includedir@ libdir = @libdir@ bindir = @bindir@ mandir = @mandir@ -VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@ +VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@:@eventsdir@ srcdir = @srcdir@ builddir = @builddir@ SLAPD = @SLAPD@ @@ -33,6 +33,9 @@ TDB_LIBS = @TDB_LIBS@ TDB_CFLAGS = @TDB_CFLAGS@ TDB_OBJ = @TDB_OBJ@ +EVENTS_CFLAGS = @EVENTS_CFLAGS@ +EVENTS_OBJ = @EVENTS_OBJ@ + POPT_LIBS = @POPT_LIBS@ POPT_CFLAGS = @POPT_CFLAGS@ POPT_OBJ = @POPT_OBJ@ @@ -52,13 +55,13 @@ LIBS = @LIBS@ PICFLAG = @PICFLAG@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ - $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \ + $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(EVENTS_CFLAGS) \ -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"$(SHLIBEXT)\" -DUSE_MMAP=1 @CFLAGS@ MDLD = @MDLD@ MDLD_FLAGS = @MDLD_FLAGS@ -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(EVENTS_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h $(srcdir)/include/ldb_handlers.h diff --git a/source4/lib/ldb/ldb.i b/source4/lib/ldb/ldb.i index 061d13a2dd..23b5e0db7a 100644 --- a/source4/lib/ldb/ldb.i +++ b/source4/lib/ldb/ldb.i @@ -685,7 +685,9 @@ PyObject *PyExc_LdbError; /* Top-level ldb operations */ typedef struct ldb_context { %extend { - ldb(void) { return ldb_init(NULL); } + ldb(void) { + return ldb_init(NULL, event_context_init(NULL)); + } %feature("docstring") connect "S.connect(url,flags=0,options=None) -> None\n" \ "Connect to a LDB URL."; diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c index ee374b85be..aed3f13abc 100644 --- a/source4/lib/ldb/ldb_wrap.c +++ b/source4/lib/ldb/ldb_wrap.c @@ -2546,7 +2546,6 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0}; #include <stdint.h> #include <stdbool.h> #include "talloc.h" -#include "events.h" #include "ldb.h" #include "ldb_errors.h" #include "ldb_private.h" @@ -3067,7 +3066,9 @@ static void py_ldb_debug(void *context, enum ldb_debug_level level, const char * PyObject *PyExc_LdbError; -SWIGINTERN ldb *new_ldb(){ return ldb_init(NULL, NULL); } +SWIGINTERN ldb *new_ldb(){ + return ldb_init(NULL, event_context_init(NULL)); + } SWIGINTERN int SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) |