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/param | |
| 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/param')
| -rw-r--r-- | source3/param/loadparm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9d8b7b195b..b9386a6396 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -240,6 +240,8 @@ typedef struct { int iAclCompat; char *szCupsServer; char *szIPrintServer; + char *ctdbdSocket; + BOOL clustering; int ldap_passwd_sync; int ldap_replication_sleep; int ldap_timeout; /* This is initialised in init_globals */ @@ -1032,6 +1034,8 @@ static struct parm_struct parm_table[] = { {"write cache size", P_INTEGER, P_LOCAL, &sDefault.iWriteCacheSize, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_DEPRECATED}, {"name cache timeout", P_INTEGER, P_GLOBAL, &Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED}, + {"ctdbd socket", P_STRING, P_GLOBAL, &Globals.ctdbdSocket, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL}, + {"clustering", P_BOOL, P_GLOBAL, &Globals.clustering, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL}, {N_("Printing Options"), P_SEP, P_SEPARATOR}, @@ -1628,6 +1632,9 @@ static void init_globals(BOOL first_time_only) string_set(&Globals.szCupsServer, ""); string_set(&Globals.szIPrintServer, ""); + string_set(&Globals.ctdbdSocket, ""); + Globals.clustering = False; + Globals.winbind_cache_time = 300; /* 5 minutes */ Globals.bWinbindEnumUsers = False; Globals.bWinbindEnumGroups = False; @@ -2038,6 +2045,8 @@ FN_GLOBAL_LIST(lp_svcctl_list, &Globals.szServicesList) FN_LOCAL_STRING(lp_cups_options, szCupsOptions) FN_GLOBAL_STRING(lp_cups_server, &Globals.szCupsServer) FN_GLOBAL_STRING(lp_iprint_server, &Globals.szIPrintServer) +FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, &Globals.ctdbdSocket) +FN_GLOBAL_BOOL(lp_clustering, &Globals.clustering); FN_LOCAL_STRING(lp_printcommand, szPrintcommand) FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand) FN_LOCAL_STRING(lp_lprmcommand, szLprmcommand) |