summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-04-01 14:01:28 +0200
committerStefan Metzmacher <metze@samba.org>2008-04-12 09:14:10 +0200
commite21b283d6713794fb0a415a9313943867812884d (patch)
treec8bbf2a910b01bb4ab50a83e824ae71094d3fba3 /source3/smbd/server.c
parent138b58bcec67e4a45cfa28213fc667504755a894 (diff)
downloadsamba-e21b283d6713794fb0a415a9313943867812884d.tar.gz
samba-e21b283d6713794fb0a415a9313943867812884d.tar.bz2
samba-e21b283d6713794fb0a415a9313943867812884d.zip
dbwrap: wait for tdb2 change notifies in smbd, nmbd and winbindd
metze (This used to be commit 64450cc1e441355aa8925b7183e90872eeab20b1)
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 7a6e17135f..bc0d4b70a3 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -553,7 +553,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
clustered mode, ctdb won't allow us to start doing database
operations until it has gone thru a full startup, which
includes checking to see that smbd is listening. */
- claim_connection(NULL,"",FLAG_MSG_GENERAL|FLAG_MSG_SMBD);
+ claim_connection(NULL,"",
+ FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP);
/* Listen to messages */
@@ -574,6 +575,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
MSG_SMB_INJECT_FAULT, msg_inject_fault);
#endif
+ db_tdb2_setup_messaging(smbd_messaging_context(), true);
+
/* now accept incoming connections - forking a new process
for each incoming connection */
DEBUG(2,("waiting for a connection\n"));
@@ -1226,6 +1229,7 @@ extern void build_options(bool screen);
/*
* Do this before reload_services.
*/
+ db_tdb2_setup_messaging(NULL, false);
if (!reload_services(False))
return(-1);