diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/cluster | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/cluster')
25 files changed, 37 insertions, 35 deletions
diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index cc61974cbd..c09d10900b 100644 --- a/source4/cluster/cluster.c +++ b/source4/cluster/cluster.c @@ -23,6 +23,7 @@ #include "cluster/cluster.h" #include "cluster/cluster_private.h" #include "librpc/gen_ndr/misc.h" +#include "librpc/gen_ndr/security.h" static struct cluster_ops *ops; diff --git a/source4/cluster/ctdb/brlock_ctdb.c b/source4/cluster/ctdb/brlock_ctdb.c index 1b22c6c727..01d60901a6 100644 --- a/source4/cluster/ctdb/brlock_ctdb.c +++ b/source4/cluster/ctdb/brlock_ctdb.c @@ -21,7 +21,7 @@ #include "includes.h" #include "system/filesys.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "messaging/messaging.h" #include "lib/messaging/irpc.h" #include "libcli/libcli.h" diff --git a/source4/cluster/ctdb/client/ctdb_client.c b/source4/cluster/ctdb/client/ctdb_client.c index 2af0d418a8..a83dd7aebe 100644 --- a/source4/cluster/ctdb/client/ctdb_client.c +++ b/source4/cluster/ctdb/client/ctdb_client.c @@ -20,13 +20,13 @@ #include "includes.h" #include "tdb_wrap.h" -#include "lib/tdb/include/tdb.h" -#include "lib/util/dlinklist.h" +#include "../tdb/include/tdb.h" +#include "../lib/util/dlinklist.h" #include "lib/events/events.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* allocate a packet for use in client<->daemon communication diff --git a/source4/cluster/ctdb/common/ctdb_io.c b/source4/cluster/ctdb/common/ctdb_io.c index ca9c635878..9116bd69f7 100644 --- a/source4/cluster/ctdb/common/ctdb_io.c +++ b/source4/cluster/ctdb/common/ctdb_io.c @@ -21,9 +21,9 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/events/events.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c index 92adc4a12a..e9ee55f6a7 100644 --- a/source4/cluster/ctdb/common/ctdb_ltdb.c +++ b/source4/cluster/ctdb/common/ctdb_ltdb.c @@ -19,12 +19,12 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" #include "tdb_wrap.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* find an attached ctdb_db handle given a name diff --git a/source4/cluster/ctdb/common/ctdb_message.c b/source4/cluster/ctdb/common/ctdb_message.c index 1aea28fd35..323e90c9e0 100644 --- a/source4/cluster/ctdb/common/ctdb_message.c +++ b/source4/cluster/ctdb/common/ctdb_message.c @@ -22,11 +22,11 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" /* this dispatches the messages to the registered ctdb message handler diff --git a/source4/cluster/ctdb/common/ctdb_util.c b/source4/cluster/ctdb/common/ctdb_util.c index f11388331d..67eb32221a 100644 --- a/source4/cluster/ctdb/common/ctdb_util.c +++ b/source4/cluster/ctdb/common/ctdb_util.c @@ -19,7 +19,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index ce295c4474..d0ceef4ad1 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -24,12 +24,13 @@ #include "cluster/cluster.h" #include "system/filesys.h" #include "cluster/cluster_private.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "include/ctdb.h" #include "tdb_wrap.h" -#include "lib/util/dlinklist.h" +#include "../lib/util/dlinklist.h" #include "param/param.h" -#include "librpc/gen_ndr/misc.h" +#include "librpc/gen_ndr/security.h" +#include "cluster/ctdb/ctdb_cluster.h" /* a linked list of messaging handlers, allowing incoming messages to be directed to the right messaging context */ diff --git a/source4/cluster/ctdb/example/cluster_start.sh b/source4/cluster/ctdb/example/cluster_start.sh index 575d031c95..825eadb483 100755 --- a/source4/cluster/ctdb/example/cluster_start.sh +++ b/source4/cluster/ctdb/example/cluster_start.sh @@ -1,12 +1,12 @@ #!/bin/sh -killall smbd +killall samba sleep 1 -killall -9 smbd +killall -9 samba killall -9 valgrind type=$1 -xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node1 -M single -i & -xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node2 -M single -i & +xterm -e $type bin/samba -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node1 -M single -i & +xterm -e $type bin/samba -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node2 -M single -i & diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index b1faf9e0e6..3313798bee 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -40,7 +40,7 @@ #include "includes.h" #include "system/filesys.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "messaging/messaging.h" #include "tdb_wrap.h" #include "lib/messaging/irpc.h" diff --git a/source4/cluster/ctdb/server/ctdb_call.c b/source4/cluster/ctdb/server/ctdb_call.c index bbe07717ed..0d09241d52 100644 --- a/source4/cluster/ctdb/server/ctdb_call.c +++ b/source4/cluster/ctdb/server/ctdb_call.c @@ -22,7 +22,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/server/ctdb_control.c b/source4/cluster/ctdb/server/ctdb_control.c index 4b826b5187..ba94b9dd24 100644 --- a/source4/cluster/ctdb/server/ctdb_control.c +++ b/source4/cluster/ctdb/server/ctdb_control.c @@ -18,7 +18,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/source4/cluster/ctdb/server/ctdb_daemon.c b/source4/cluster/ctdb/server/ctdb_daemon.c index f96cd86916..46e81ab3c3 100644 --- a/source4/cluster/ctdb/server/ctdb_daemon.c +++ b/source4/cluster/ctdb/server/ctdb_daemon.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/events/events.h" #include "lib/util/dlinklist.h" #include "system/network.h" diff --git a/source4/cluster/ctdb/server/ctdb_freeze.c b/source4/cluster/ctdb/server/ctdb_freeze.c index 2294266890..391c6b86d0 100644 --- a/source4/cluster/ctdb/server/ctdb_freeze.c +++ b/source4/cluster/ctdb/server/ctdb_freeze.c @@ -18,7 +18,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/source4/cluster/ctdb/server/ctdb_lockwait.c b/source4/cluster/ctdb/server/ctdb_lockwait.c index 2fc3e7a3ed..1112ab2054 100644 --- a/source4/cluster/ctdb/server/ctdb_lockwait.c +++ b/source4/cluster/ctdb/server/ctdb_lockwait.c @@ -21,7 +21,7 @@ #include "lib/events/events.h" #include "system/filesys.h" #include "system/wait.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/server/ctdb_ltdb_server.c b/source4/cluster/ctdb/server/ctdb_ltdb_server.c index 68ed546b27..cabdeb124c 100644 --- a/source4/cluster/ctdb/server/ctdb_ltdb_server.c +++ b/source4/cluster/ctdb/server/ctdb_ltdb_server.c @@ -19,7 +19,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/server/ctdb_recover.c b/source4/cluster/ctdb/server/ctdb_recover.c index 6065016e1f..1e70d1de7a 100644 --- a/source4/cluster/ctdb/server/ctdb_recover.c +++ b/source4/cluster/ctdb/server/ctdb_recover.c @@ -19,7 +19,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/source4/cluster/ctdb/server/ctdb_server.c b/source4/cluster/ctdb/server/ctdb_server.c index 1480127327..0cfbdc0f2f 100644 --- a/source4/cluster/ctdb/server/ctdb_server.c +++ b/source4/cluster/ctdb/server/ctdb_server.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/events/events.h" #include "lib/util/dlinklist.h" #include "system/network.h" diff --git a/source4/cluster/ctdb/server/ctdb_takeover.c b/source4/cluster/ctdb/server/ctdb_takeover.c index 42a23808dd..53a5a1dc3c 100644 --- a/source4/cluster/ctdb/server/ctdb_takeover.c +++ b/source4/cluster/ctdb/server/ctdb_takeover.c @@ -19,7 +19,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/util/dlinklist.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/server/ctdb_traverse.c b/source4/cluster/ctdb/server/ctdb_traverse.c index 233de62e2b..d735594e73 100644 --- a/source4/cluster/ctdb/server/ctdb_traverse.c +++ b/source4/cluster/ctdb/server/ctdb_traverse.c @@ -21,7 +21,7 @@ #include "lib/events/events.h" #include "system/filesys.h" #include "system/wait.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "../include/ctdb_private.h" typedef void (*ctdb_traverse_fn_t)(void *private_data, TDB_DATA key, TDB_DATA data); diff --git a/source4/cluster/ctdb/takeover/ctdb_takeover.c b/source4/cluster/ctdb/takeover/ctdb_takeover.c index 862382d90a..ae68725271 100644 --- a/source4/cluster/ctdb/takeover/ctdb_takeover.c +++ b/source4/cluster/ctdb/takeover/ctdb_takeover.c @@ -19,7 +19,7 @@ */ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "system/wait.h" diff --git a/source4/cluster/ctdb/tcp/tcp_connect.c b/source4/cluster/ctdb/tcp/tcp_connect.c index 2f828e5717..3c167532ba 100644 --- a/source4/cluster/ctdb/tcp/tcp_connect.c +++ b/source4/cluster/ctdb/tcp/tcp_connect.c @@ -19,7 +19,7 @@ #include "includes.h" #include "lib/events/events.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/ctdb/tcp/tcp_init.c b/source4/cluster/ctdb/tcp/tcp_init.c index f5d4e4c1d6..b8296d5244 100644 --- a/source4/cluster/ctdb/tcp/tcp_init.c +++ b/source4/cluster/ctdb/tcp/tcp_init.c @@ -18,7 +18,7 @@ */ #include "includes.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "lib/events/events.h" #include "system/network.h" #include "system/filesys.h" diff --git a/source4/cluster/ctdb/tcp/tcp_io.c b/source4/cluster/ctdb/tcp/tcp_io.c index c10afb3425..d3afdc165a 100644 --- a/source4/cluster/ctdb/tcp/tcp_io.c +++ b/source4/cluster/ctdb/tcp/tcp_io.c @@ -20,7 +20,7 @@ #include "includes.h" #include "lib/events/events.h" #include "lib/util/dlinklist.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "system/network.h" #include "system/filesys.h" #include "../include/ctdb_private.h" diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 96636927f1..5b872a3e2e 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -22,11 +22,11 @@ #include "includes.h" #include "cluster/cluster.h" #include "cluster/cluster_private.h" -#include "lib/tdb/include/tdb.h" +#include "../tdb/include/tdb.h" #include "tdb_wrap.h" #include "system/filesys.h" #include "param/param.h" -#include "librpc/gen_ndr/misc.h" +#include "librpc/gen_ndr/security.h" /* server a server_id for the local node |