diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-08-28 02:37:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:51 -0500 |
| commit | c98c6aa5611f26ab591c50fcded1fc55e81a0d07 (patch) | |
| tree | 599e3e9efc13a33535b50d40d9035c57a853dc19 /source4/lib/db_wrap.c | |
| parent | e669d0c53d843e664fc5b3d8f3ebcb170ceb8f37 (diff) | |
| download | samba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.tar.gz samba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.tar.bz2 samba-c98c6aa5611f26ab591c50fcded1fc55e81a0d07.zip | |
r9702: r9680@blu: tridge | 2005-08-27 18:45:08 +1000
- fixed ncacn_ip_tcp to use the generic async name resolution methods,
so NBT names now work (as requested several times by abartlet!)
- changed resolve_name() to take an event_context, so it doesn't cause
the whole process to block
- cleaned up the talloc_find_parent_bytype() calls to go via a cleaner
event_context_find() call
(This used to be commit b3d491b210a8b889a25efcb273e70fefbd01b7f7)
Diffstat (limited to 'source4/lib/db_wrap.c')
| -rw-r--r-- | source4/lib/db_wrap.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index 8698e9affd..77af27ff36 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -29,6 +29,7 @@ #include "includes.h" #include "dlinklist.h" +#include "lib/events/events.h" #include "lib/tdb/include/tdb.h" #include "lib/ldb/include/ldb.h" #include "db_wrap.h" @@ -76,12 +77,7 @@ struct ldb_context *ldb_wrap_connect(TALLOC_CTX *mem_ctx, /* we want to use the existing event context if possible. This relies on the fact that in smbd, everything is a child of the main event_context */ - ev = talloc_find_parent_bytype(mem_ctx, struct event_context); - if (ev) { - ldb_set_opaque(ldb, "EventContext", ev); - } else { - DEBUG(5,("WARNING: event_context not found\n")); - } + ev = event_context_find(ldb); ret = ldb_register_samba_handlers(ldb); if (ret == -1) { |