diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-23 14:50:56 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-23 14:52:18 +1100 |
| commit | 890e7719cf679108e7a74a660f20a40a32d7d552 (patch) | |
| tree | 0f46850631f62337a32dd4b76b209c7f56a9e367 /source4/smbd | |
| parent | 906961cd8ce4a68117fbb5dc96bfb4f5379daa5b (diff) | |
| download | samba-890e7719cf679108e7a74a660f20a40a32d7d552.tar.gz samba-890e7719cf679108e7a74a660f20a40a32d7d552.tar.bz2 samba-890e7719cf679108e7a74a660f20a40a32d7d552.zip | |
s4-ldb: move the tdb_reopen_all() calls to ldb_wrap.c
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_prefork.c | 5 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index db5633b9f2..f890a528d5 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -25,7 +25,6 @@ #include "includes.h" #include "lib/events/events.h" -#include "../tdb/include/tdb.h" #include "lib/socket/socket.h" #include "smbd/process_model.h" #include "param/secrets.h" @@ -57,10 +56,6 @@ static void prefork_model_init(struct tevent_context *ev) static void prefork_reload_after_fork(void) { - /* tdb needs special fork handling */ - if (tdb_reopen_all(1) == -1) { - DEBUG(0,("prefork_reload_after_fork: tdb_reopen_all failed.\n")); - } ldb_wrap_fork_hook(); /* Ensure that the forked children do not expose identical random streams */ diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 6e7b714a63..ab5ad5760c 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -23,7 +23,6 @@ #include "includes.h" #include "lib/events/events.h" -#include "../tdb/include/tdb.h" #include "smbd/process_model.h" #include "system/filesys.h" #include "cluster/cluster.h" @@ -125,9 +124,6 @@ static void standard_accept_connection(struct tevent_context *ev, socket_dup(sock2); /* tdb needs special fork handling */ - if (tdb_reopen_all(1) == -1) { - DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n")); - } ldb_wrap_fork_hook(); tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ, @@ -192,10 +188,7 @@ static void standard_new_task(struct tevent_context *ev, is not associated with this new connection */ talloc_free(ev); - /* tdb needs special fork handling */ - if (tdb_reopen_all(1) == -1) { - DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n")); - } + /* ldb/tdb need special fork handling */ ldb_wrap_fork_hook(); tevent_add_fd(ev2, ev2, child_pipe[0], TEVENT_FD_READ, |