param: Rename variable used for lp_force_dir_mode iDir_force_mode
authorAndrew Bartlett <abartlet@samba.org>
Tue, 24 Dec 2013 03:03:20 +0000 (16:03 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 25 Jan 2014 00:18:43 +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 74ccb34784c553ec5cb125a9f6bcfbcbf15eef3b..d7933ee91f7108baaeef4dae6f64aceb47986055 100644 (file)
@@ -2058,7 +2058,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_ctx->sDefault->create_mask = 0744;
        lp_ctx->sDefault->force_create_mode = 0000;
        lp_ctx->sDefault->dir_mask = 0755;
-       lp_ctx->sDefault->iDir_force_mode = 0000;
+       lp_ctx->sDefault->force_dir_mode = 0000;
 
        DEBUG(3, ("Initialising global parameters\n"));
 
index b160c100c23c65ee4452f5150a2ac0c911adf568..4ec8cead3c4a57c0a5301b53faabf512323c74bf 100644 (file)
@@ -46,7 +46,7 @@ FN_LOCAL_INTEGER(csc_policy, csc_policy)
 FN_LOCAL_INTEGER(create_mask, create_mask)
 FN_LOCAL_INTEGER(force_create_mode, force_create_mode)
 FN_LOCAL_INTEGER(dir_mask, dir_mask)
-FN_LOCAL_INTEGER(force_dir_mode, iDir_force_mode)
+FN_LOCAL_INTEGER(force_dir_mode, force_dir_mode)
 FN_LOCAL_STRING(preexec, szPreExec)
 FN_LOCAL_STRING(postexec, szPostExec)
 FN_LOCAL_STRING(rootpreexec, szRootPreExec)
index 4e154f01c29fcf099804e078bde2251037b2d3e6..3c5c7bf264025ac15c23bf27c94463ceb7f33131 100644 (file)
@@ -963,7 +963,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(iDir_force_mode),
+               .offset         = LOCAL_VAR(force_dir_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
index 963fce8ea1b33a990a312973a48c8b4aaddb1cb7..57878dfcedeae9dc59730d8f5e8291ee878dea16 100644 (file)
@@ -193,7 +193,7 @@ static struct loadparm_service sDefault =
        .create_mask = 0744,
        .force_create_mode = 0,
        .dir_mask = 0755,
-       .iDir_force_mode = 0,
+       .force_dir_mode = 0,
        .max_connections = 0,
        .iDefaultCase = CASE_LOWER,
        .iPrinting = DEFAULT_PRINTING,