summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:03:34 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:48 -0800
commitb302df5d7fbc094fd33d4d8bc7880a5062f516cf (patch)
tree022baa93b934ecd9e0a3ee35bba9c74f5c35e56d
parent5d5ddef1c735fd71f65442e3dbc4390cf275914e (diff)
downloadsamba-b302df5d7fbc094fd33d4d8bc7880a5062f516cf.tar.gz
samba-b302df5d7fbc094fd33d4d8bc7880a5062f516cf.tar.xz
samba-b302df5d7fbc094fd33d4d8bc7880a5062f516cf.zip
param: Rename variable used for lp_blocking_locks bBlockingLocks
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 256634ef37..e2b9030b71 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -115,7 +115,7 @@ FN_LOCAL_BOOL(dos_filemode, dos_filemode)
FN_LOCAL_BOOL(dos_filetimes, dos_filetimes)
FN_LOCAL_BOOL(dos_filetime_resolution, dos_filetime_resolution)
FN_LOCAL_BOOL(fake_dir_create_times, fake_dir_create_times)
-FN_LOCAL_BOOL(blocking_locks, bBlockingLocks)
+FN_LOCAL_BOOL(blocking_locks, blocking_locks)
FN_LOCAL_BOOL(inherit_perms, bInheritPerms)
FN_LOCAL_BOOL(inherit_acls, bInheritACLS)
FN_LOCAL_BOOL(inherit_owner, bInheritOwner)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 55678b7206..b54a30da1e 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2938,7 +2938,7 @@ static struct parm_struct parm_table[] = {
.label = "blocking locks",
.type = P_BOOL,
.p_class = P_LOCAL,
- .offset = LOCAL_VAR(bBlockingLocks),
+ .offset = LOCAL_VAR(blocking_locks),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a53df49019..6366fb6838 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -246,7 +246,7 @@ static struct loadparm_service sDefault =
.dos_filetimes = true,
.dos_filetime_resolution = false,
.fake_dir_create_times = false,
- .bBlockingLocks = true,
+ .blocking_locks = true,
.bInheritPerms = false,
.bInheritACLS = false,
.bInheritOwner = false,