diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:03:59 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:56 -0800 |
| commit | 67d54939c28ae84d689171ee868dac64586e50e6 (patch) | |
| tree | 2d85631586bcd223110dd8d61505f845513ab31a | |
| parent | 540d7cac814e6ef44f0f727c42d4c26e94b22f8a (diff) | |
| download | samba-67d54939c28ae84d689171ee868dac64586e50e6.tar.gz samba-67d54939c28ae84d689171ee868dac64586e50e6.tar.xz samba-67d54939c28ae84d689171ee868dac64586e50e6.zip | |
param: Rename variable used for lp_ctdbd_socket ctdbdSocket
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index ed34722a8f..8af14be3cc 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -238,7 +238,7 @@ FN_GLOBAL_BOOL(winbind_use_default_domain, winbind_use_default_domain) FN_GLOBAL_BOOL(wins_dns_proxy, wins_dns_proxy) FN_GLOBAL_BOOL(wins_proxy, wins_proxy) FN_GLOBAL_CONST_STRING(afs_username_map, afs_username_map) -FN_GLOBAL_CONST_STRING(ctdbd_socket, ctdbdSocket) +FN_GLOBAL_CONST_STRING(ctdbd_socket, ctdbd_socket) FN_GLOBAL_CONST_STRING(dedicated_keytab_file, szDedicatedKeytabFile) FN_GLOBAL_CONST_STRING(dnsdomain, szRealm_lower) FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 5b69775453..50e470b77c 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -1938,7 +1938,7 @@ static struct parm_struct parm_table[] = { .label = "ctdbd socket", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(ctdbdSocket), + .offset = GLOBAL_VAR(ctdbd_socket), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_GLOBAL, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8e24881b91..32c5556a3c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -967,9 +967,9 @@ static void init_globals(bool reinit_globals) string_set(&Globals.szIPrintServer, ""); #ifdef CLUSTER_SUPPORT - string_set(&Globals.ctdbdSocket, CTDB_PATH); + string_set(&Globals.ctdbd_socket, CTDB_PATH); #else - string_set(&Globals.ctdbdSocket, ""); + string_set(&Globals.ctdbd_socket, ""); #endif Globals.szClusterAddresses = NULL; |