diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-07-24 10:24:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:57 -0500 |
| commit | 4ce5c3636714e80f740c141587c1e7a9ca3b67bb (patch) | |
| tree | 67f38ef59f6427ac44ddb78bb7d609576d962d79 /source3/param/loadparm.c | |
| parent | 12324f017c06e95013b4a6130df9cfa5e270ac0d (diff) | |
| download | samba-4ce5c3636714e80f740c141587c1e7a9ca3b67bb.tar.gz samba-4ce5c3636714e80f740c141587c1e7a9ca3b67bb.tar.bz2 samba-4ce5c3636714e80f740c141587c1e7a9ca3b67bb.zip | |
r24027: merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:
add in any cluster addresses. We need to response to these,
but not listen on them. This allows us to run nmbd on every
node in the cluster, and have all of them register with a
WINS server correctly
metze
(This used to be commit 98c57562c4dcf04b72a1e4ad5d9f5cf48e7d0b28)
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index e62eaaf3fb..372cfd529d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -252,6 +252,7 @@ typedef struct { char *szCupsServer; char *szIPrintServer; char *ctdbdSocket; + char **szClusterAddresses; BOOL clustering; int ldap_passwd_sync; int ldap_replication_sleep; @@ -1046,6 +1047,7 @@ static struct parm_struct parm_table[] = { {"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}, + {"cluster addresses", P_LIST, P_GLOBAL, &Globals.szClusterAddresses, 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}, @@ -1645,6 +1647,7 @@ static void init_globals(BOOL first_time_only) string_set(&Globals.szIPrintServer, ""); string_set(&Globals.ctdbdSocket, ""); + Globals.szClusterAddresses = NULL; Globals.clustering = False; Globals.winbind_cache_time = 300; /* 5 minutes */ @@ -2061,6 +2064,7 @@ 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_LIST(lp_cluster_addresses, &Globals.szClusterAddresses) FN_GLOBAL_BOOL(lp_clustering, &Globals.clustering); FN_LOCAL_STRING(lp_printcommand, szPrintcommand) FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand) |