loadparm: rename variable for "directory mask" from dir_mask to directory_mask

for consistency docs/functions/variables

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Feb  3 07:29:43 CET 2014 on sn-devel-104

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 263f585e235a41f2ab6cc6223815330e1bea3d36..df9a3248bd45af977f7377c5e65adaa25b772477 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2014,7 +2014,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lp_ctx->sDefault->oplocks = true;
        lp_ctx->sDefault->create_mask = 0744;
        lp_ctx->sDefault->force_create_mode = 0000;
-       lp_ctx->sDefault->dir_mask = 0755;
+       lp_ctx->sDefault->directory_mask = 0755;
        lp_ctx->sDefault->force_dir_mode = 0000;
 
        DEBUG(3, ("Initialising global parameters\n"));

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 3ba3083fbec80ff939a13046094521fd1c24bc62..b81ad61bc4af06e4ec4b4356bd0d9176d8f8f6ca 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -45,7 +45,7 @@ FN_LOCAL_INTEGER(max_connections, max_connections)
 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(directory_mask, dir_mask)
+FN_LOCAL_INTEGER(directory_mask, directory_mask)
 FN_LOCAL_INTEGER(force_dir_mode, force_dir_mode)
 FN_LOCAL_STRING(preexec, preexec)
 FN_LOCAL_STRING(postexec, postexec)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 6b4052f6bf80a9742239b7998025f59836745a35..66b1d438333dd3b353da82be0419330825a8b392 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -945,7 +945,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mask",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(dir_mask),
+               .offset         = LOCAL_VAR(directory_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -954,7 +954,7 @@ static struct parm_struct parm_table[] = {
                .label          = "directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(dir_mask),
+               .offset         = LOCAL_VAR(directory_mask),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3e7883882028874641c2484d21a93b56a29fa546..c6fd8a3fd77bbec1c86bc5ef393c2bb22cb28a77 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -192,7 +192,7 @@ static struct loadparm_service sDefault =
        .write_cache_size = 0,
        .create_mask = 0744,
        .force_create_mode = 0,
-       .dir_mask = 0755,
+       .directory_mask = 0755,
        .force_dir_mode = 0,
        .max_connections = 0,
        .defaultcase = CASE_LOWER,