diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-06-10 17:02:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:14 -0500 |
| commit | de565785f5e1f097bd75f57331425c4185185f80 (patch) | |
| tree | af24bb44388f9ffa2077435cc3fea134557c186b /source3/smbd | |
| parent | b05c7b97830f6029c264fc44831c2f5eae4f0c83 (diff) | |
| download | samba-de565785f5e1f097bd75f57331425c4185185f80.tar.gz samba-de565785f5e1f097bd75f57331425c4185185f80.tar.bz2 samba-de565785f5e1f097bd75f57331425c4185185f80.zip | |
r23410: Merge the core of the cluster code.
I'm 100% certain I've forgotten to merge something, but the main code
should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and
messages_ctdbd.c.
There should be no changes to the non-cluster case, it does survive make
test on my laptop.
It survives some very basic tests with ctdbd enables, I did not do the
full test suite for clusters yet.
Phew...
Volker
(This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/oplock.c | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 9f3679390b..ddb05d8b92 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -833,6 +833,9 @@ void share_mode_entry_to_message(char *msg, struct share_mode_entry *e) SIVAL(msg,44,e->share_file_id); SIVAL(msg,48,e->uid); SSVAL(msg,52,e->flags); +#ifdef CLUSTER_SUPPORT + SIVAL(msg,54,e->pid.vnn); +#endif } /**************************************************************************** @@ -853,6 +856,9 @@ void message_to_share_mode_entry(struct share_mode_entry *e, char *msg) e->share_file_id = (unsigned long)IVAL(msg,44); e->uid = (uint32)IVAL(msg,48); e->flags = (uint16)SVAL(msg,52); +#ifdef CLUSTER_SUPPORT + e->pid.vnn = IVAL(msg,54); +#endif } /**************************************************************************** diff --git a/source3/smbd/server.c b/source3/smbd/server.c index e95f3cf4a2..98b9fb8626 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1112,6 +1112,13 @@ extern void build_options(BOOL screen); /* Setup aio signal handler. */ initialize_async_io_handler(); + /* + * For clustering, we need to re-init our ctdbd connection after the + * fork + */ + if (!NT_STATUS_IS_OK(messaging_reinit(smbd_messaging_context()))) + exit(1); + /* register our message handlers */ messaging_register(smbd_messaging_context(), NULL, MSG_SMB_FORCE_TDIS, msg_force_tdis); |