summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-12-24 16:03:31 +1300
committerJeremy Allison <jra@samba.org>2014-01-24 16:18:46 -0800
commitfe0b194067a354b2feaa1e3ca4854ef1a84c3731 (patch)
tree8d68c0620c0d17521983437f71e29987b6d97294
parent7e11a91502d6801e74bdc2272fe02228b375e998 (diff)
downloadsamba-fe0b194067a354b2feaa1e3ca4854ef1a84c3731.tar.gz
samba-fe0b194067a354b2feaa1e3ca4854ef1a84c3731.tar.xz
samba-fe0b194067a354b2feaa1e3ca4854ef1a84c3731.zip
param: Rename variable used for lp_strict_locking iStrictLocking
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/loadparm.c2
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index d7933ee91f..eab1c3b5ac 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2053,7 +2053,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_ctx->sDefault->browseable = true;
lp_ctx->sDefault->readonly = true;
lp_ctx->sDefault->map_archive = true;
- lp_ctx->sDefault->iStrictLocking = true;
+ lp_ctx->sDefault->strict_locking = true;
lp_ctx->sDefault->oplocks = true;
lp_ctx->sDefault->create_mask = 0744;
lp_ctx->sDefault->force_create_mode = 0000;
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 37442894b7..50a1eef2a1 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -98,7 +98,7 @@ FN_LOCAL_BOOL(print_notify_backchannel, print_notify_backchannel)
FN_LOCAL_BOOL(store_dos_attributes, store_dos_attributes)
FN_LOCAL_BOOL(dmapi_support, dmapi_support)
FN_LOCAL_PARM_BOOL(locking, locking)
-FN_LOCAL_PARM_INTEGER(strict_locking, iStrictLocking)
+FN_LOCAL_PARM_INTEGER(strict_locking, strict_locking)
FN_LOCAL_PARM_BOOL(posix_locking, bPosixLocking)
FN_LOCAL_BOOL(kernel_oplocks, bKernelOplocks)
FN_LOCAL_BOOL(level2_oplocks, bLevel2OpLocks)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index a9e1946c7d..a8126b275f 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3046,7 +3046,7 @@ static struct parm_struct parm_table[] = {
.label = "strict locking",
.type = P_ENUM,
.p_class = P_LOCAL,
- .offset = LOCAL_VAR(iStrictLocking),
+ .offset = LOCAL_VAR(strict_locking),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 90b84f91a3..c5f03c9179 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -225,7 +225,7 @@ static struct loadparm_service sDefault =
.store_dos_attributes = false,
.dmapi_support = false,
.locking = true,
- .iStrictLocking = Auto,
+ .strict_locking = Auto,
.bPosixLocking = true,
.oplocks = true,
.bKernelOplocks = false,