param: Rename variable used for lp_oplocks bOpLocks
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Dec 2013 03:03:18 +0000 (16:03 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 25 Jan 2014 00:18:42 +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 f806b22544123c19f48676e9b5bb65fdb94a5eed..ee9820a603e5870a1af0600fc2e41066baf0020b 100644 (file)
@@ -2054,7 +2054,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_ctx->sDefault->readonly = true;
        lp_ctx->sDefault->map_archive = true;
        lp_ctx->sDefault->iStrictLocking = true;
-       lp_ctx->sDefault->bOpLocks = true;
+       lp_ctx->sDefault->oplocks = true;
        lp_ctx->sDefault->iCreate_mask = 0744;
        lp_ctx->sDefault->iCreate_force_mode = 0000;
        lp_ctx->sDefault->iDir_mask = 0755;
index 8642dae9e3f8a5b291417e4eb4ead2f88be9a2e9..4378ff2791276b4ab6365954167bf85358995843 100644 (file)
@@ -38,7 +38,7 @@ FN_LOCAL_BOOL(readonly, readonly)
 FN_LOCAL_BOOL(print_ok, print_ok)
 FN_LOCAL_BOOL(map_hidden, map_hidden)
 FN_LOCAL_BOOL(map_archive, map_archive)
-FN_LOCAL_BOOL(oplocks, bOpLocks)
+FN_LOCAL_BOOL(oplocks, oplocks)
 FN_LOCAL_BOOL(strict_sync, bStrictSync)
 FN_LOCAL_BOOL(map_system, bMap_system)
 FN_LOCAL_INTEGER(max_connections, iMaxConnections)
index b3df9c8e34416f357a6218998a85431c05e2c79c..e87496b978f4c634e120c956cde14da828b6a7aa 100644 (file)
@@ -3001,7 +3001,7 @@ static struct parm_struct parm_table[] = {
                .label          = "oplocks",
                .type           = P_BOOL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(bOpLocks),
+               .offset         = LOCAL_VAR(oplocks),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
index 2184cf5480546b4cc23fc370654caad0e1b24736..4b32a62cf1aec0b13c4a5726db3addd577f76dd9 100644 (file)
@@ -227,7 +227,7 @@ static struct loadparm_service sDefault =
        .bLocking = true,
        .iStrictLocking = Auto,
        .bPosixLocking = true,
-       .bOpLocks = true,
+       .oplocks = true,
        .bKernelOplocks = false,
        .bLevel2OpLocks = true,
        .bOnlyUser = false,
@@ -1782,7 +1782,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
        /* Printers cannot be read_only. */
        ServicePtrs[i]->readonly = false;
        /* No oplocks on printer services. */
-       ServicePtrs[i]->bOpLocks = false;
+       ServicePtrs[i]->oplocks = false;
        /* Printer services must be printable. */
        ServicePtrs[i]->print_ok = true;