summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:03 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:57 -0800
commit137d72dd28eeea53e12e02cf3280e2f1a23bbc02 (patch)
treeaf9fc8e77433d745846797ff206faaab871be7d7
parent06499f739bd9df3e4be89ae09ac58286a286e8d1 (diff)
downloadsamba-137d72dd28eeea53e12e02cf3280e2f1a23bbc02.tar.gz
samba-137d72dd28eeea53e12e02cf3280e2f1a23bbc02.tar.xz
samba-137d72dd28eeea53e12e02cf3280e2f1a23bbc02.zip
param: Rename variable used for lp_piddir szPidDir
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.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 43908701a3..0ac87a39ec 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -256,7 +256,7 @@ FN_GLOBAL_CONST_STRING(netbios_scope, netbios_scope)
FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, ntp_signd_socket_directory)
FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
FN_GLOBAL_CONST_STRING(passwordserver, passwordserver)
-FN_GLOBAL_CONST_STRING(piddir, szPidDir)
+FN_GLOBAL_CONST_STRING(piddir, piddir)
FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 9e8f1f70f4..8c696cddb0 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3334,7 +3334,7 @@ static struct parm_struct parm_table[] = {
.label = "pid directory",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szPidDir),
+ .offset = GLOBAL_VAR(piddir),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c4cad1f163..b9562c7e90 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -776,7 +776,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.lockdir, get_dyn_LOCKDIR());
string_set(&Globals.szStateDir, get_dyn_STATEDIR());
string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
- string_set(&Globals.szPidDir, get_dyn_PIDDIR());
+ string_set(&Globals.piddir, get_dyn_PIDDIR());
string_set(&Globals.nbt_client_socket_address, "0.0.0.0");
/*
* By default support explicit binding to broadcast