summaryrefslogtreecommitdiffstats
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:04:01 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:57 -0800
commit37318b650b7de8d87e4ace4cd80de3fb73a3b2b2 (patch)
tree900da895480cb5c594d296b239e680c6304c2105 /source3/param/loadparm.c
parent603282d5f56bbcdb1f913dbdc8a6a568706d3bf5 (diff)
downloadsamba-37318b650b7de8d87e4ace4cd80de3fb73a3b2b2.tar.gz
samba-37318b650b7de8d87e4ace4cd80de3fb73a3b2b2.tar.xz
samba-37318b650b7de8d87e4ace4cd80de3fb73a3b2b2.zip
param: Rename variable used for lp_lockdir szLockDir
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5a50fac903..25b6cdf88b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -773,7 +773,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.szWorkgroup, DEFAULT_WORKGROUP);
string_set(&Globals.szPasswdProgram, "");
- string_set(&Globals.szLockDir, get_dyn_LOCKDIR());
+ 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());
@@ -1131,8 +1131,8 @@ const char *lp_statedir(void) {
return(*(char **)(&Globals.szStateDir) ?
*(char **)(&Globals.szStateDir) : "");
else
- return(*(char **)(&Globals.szLockDir) ?
- *(char **)(&Globals.szLockDir) : "");
+ return(*(char **)(&Globals.lockdir) ?
+ *(char **)(&Globals.lockdir) : "");
}
const char *lp_cachedir(void) {
if ((strcmp(get_dyn_CACHEDIR(), get_dyn_LOCKDIR()) != 0) ||
@@ -1140,8 +1140,8 @@ const char *lp_cachedir(void) {
return(*(char **)(&Globals.szCacheDir) ?
*(char **)(&Globals.szCacheDir) : "");
else
- return(*(char **)(&Globals.szLockDir) ?
- *(char **)(&Globals.szLockDir) : "");
+ return(*(char **)(&Globals.lockdir) ?
+ *(char **)(&Globals.lockdir) : "");
}
static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int,
winbindMaxDomainConnections)