diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:01 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:18:57 -0800 |
| commit | 37318b650b7de8d87e4ace4cd80de3fb73a3b2b2 (patch) | |
| tree | 900da895480cb5c594d296b239e680c6304c2105 | |
| parent | 603282d5f56bbcdb1f913dbdc8a6a568706d3bf5 (diff) | |
| download | samba-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>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 190108b2cc..41ba70cfa9 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -244,7 +244,7 @@ FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain) FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder) FN_GLOBAL_CONST_STRING(dos_charset, dos_charset) FN_GLOBAL_CONST_STRING(guestaccount, guestaccount) -FN_GLOBAL_CONST_STRING(lockdir, szLockDir) +FN_GLOBAL_CONST_STRING(lockdir, lockdir) FN_GLOBAL_CONST_STRING(logon_drive, szLogonDrive) FN_GLOBAL_CONST_STRING(logon_home, szLogonHome) FN_GLOBAL_CONST_STRING(logon_path, szLogonPath) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 591a43da36..f0b309602a 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3298,7 +3298,7 @@ static struct parm_struct parm_table[] = { .label = "lock directory", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szLockDir), + .offset = GLOBAL_VAR(lockdir), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, @@ -3307,7 +3307,7 @@ static struct parm_struct parm_table[] = { .label = "lock dir", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szLockDir), + .offset = GLOBAL_VAR(lockdir), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, 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) |