param: Rename variable used for lp_strict_locking iStrictLocking
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Dec 2013 03:03:31 +0000 (16:03 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 25 Jan 2014 00:18:46 +0000 (16:18 -0800)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/loadparm.c
lib/param/param_functions.c
lib/param/param_table.c
source3/param/loadparm.c

index d7933ee91f7108baaeef4dae6f64aceb47986055..eab1c3b5aca008dad63c0bb80029f08e1654f8c3 100644 (file)
@@ -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;
index 37442894b79ec1a14aa2c1f10fe10f4fbd5ff910..50a1eef2a1a883aeea5bcaad7ca57b7093e84491 100644 (file)
@@ -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)
index a9e1946c7d59c28c78bc2dc518a9911dbed9fd0b..a8126b275f00f2b87e340da6ca82341b197fc7c4 100644 (file)
@@ -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,
index 90b84f91a364270c9aa009204ef1debe941f2412..c5f03c917973c450f8aa9730e98478fa983d432f 100644 (file)
@@ -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,