diff options
| author | Simo Sorce <idra@samba.org> | 2008-06-14 11:24:17 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-06-14 11:59:19 -0400 |
| commit | 929adc9efa5cf985f0585214d30d18521aa1a821 (patch) | |
| tree | 2a0f3e4dedc1336fb29aa4f36f302f29c5439f55 /source4/lib/ldb/include | |
| parent | 2aba4107915611b223daa8c27c52352f57b25bbc (diff) | |
| download | samba-929adc9efa5cf985f0585214d30d18521aa1a821.tar.gz samba-929adc9efa5cf985f0585214d30d18521aa1a821.tar.bz2 samba-929adc9efa5cf985f0585214d30d18521aa1a821.zip | |
Make up the right dependencies now that ldb depends on libevents
(This used to be commit 3b8eec7ca334528cad3cdcd5e3fc5ee555d8d0e0)
Diffstat (limited to 'source4/lib/ldb/include')
| -rw-r--r-- | source4/lib/ldb/include/ldb.h | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb_includes.h | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/include/ldb_private.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 2e13a774b9..c43d425585 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -782,6 +782,8 @@ int ldb_set_timeout(struct ldb_context *ldb, struct ldb_request *req, int timeou int ldb_set_timeout_from_prev_req(struct ldb_context *ldb, struct ldb_request *oldreq, struct ldb_request *newreq); void ldb_set_create_perms(struct ldb_context *ldb, unsigned int perms); void ldb_set_modules_dir(struct ldb_context *ldb, const char *path); +void ldb_set_event_context(struct ldb_context *ldb, struct event_context *ev); +struct event_context * ldb_get_event_context(struct ldb_context *ldb); /** Initialise ldbs' global information @@ -803,7 +805,7 @@ int ldb_global_init(void); \return pointer to ldb_context that should be free'd (using talloc_free()) at the end of the program. */ -struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx); +struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx); /** Connect to a database. diff --git a/source4/lib/ldb/include/ldb_includes.h b/source4/lib/ldb/include/ldb_includes.h index cc9b46ac1f..29c7b2dc5a 100644 --- a/source4/lib/ldb/include/ldb_includes.h +++ b/source4/lib/ldb/include/ldb_includes.h @@ -20,6 +20,7 @@ #include "system/filesys.h" #include "system/time.h" #include "talloc.h" +#include "events.h" #include "ldb.h" #include "ldb_errors.h" #include "ldb_private.h" diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index ea8533bc38..d7c2efe8a1 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -133,6 +133,8 @@ struct ldb_context { unsigned int create_perms; char *modules_dir; + + struct event_context *ev_ctx; }; #ifndef ARRAY_SIZE |