param: rename lp function and variable from 'force_dir_mode' to 'force_directory_mode'

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index df9a3248bd45af977f7377c5e65adaa25b772477..f22bb5522919188e69ba91ab9d0dedda18688c03 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2015,7 +2015,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->directory_mask = 0755;
-       lp_ctx->sDefault->force_dir_mode = 0000;
+       lp_ctx->sDefault->force_directory_mode = 0000;
 
        DEBUG(3, ("Initialising global parameters\n"));
 

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

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 66b1d438333dd3b353da82be0419330825a8b392..0724fb8c003df340061fa26d5c8368cf2a414c1f 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -963,7 +963,7 @@ static struct parm_struct parm_table[] = {
                .label          = "force directory mode",
                .type           = P_OCTAL,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(force_dir_mode),
+               .offset         = LOCAL_VAR(force_directory_mode),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c6fd8a3fd77bbec1c86bc5ef393c2bb22cb28a77..28fbf4077a702063399c32d1b9aaedb00f198a0d 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -193,7 +193,7 @@ static struct loadparm_service sDefault =
        .create_mask = 0744,
        .force_create_mode = 0,
        .directory_mask = 0755,
-       .force_dir_mode = 0,
+       .force_directory_mode = 0,
        .max_connections = 0,
        .defaultcase = CASE_LOWER,
        .printing = DEFAULT_PRINTING,

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index e0cf97c28a570a1a52555bb45fcf17a000efd573..2a6b3fe9607c1ceea1460c3b9b85ac8373e41f13 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -164,7 +164,7 @@ mode_t unix_mode(connection_struct *conn, int dosmode,
                        /* Apply directory mask */
                        result &= lp_directory_mask(SNUM(conn));
                        /* Add in force bits */
-                       result |= lp_force_dir_mode(SNUM(conn));
+                       result |= lp_force_directory_mode(SNUM(conn));
                }
        } else { 
                if (lp_map_archive(SNUM(conn)) && IS_DOS_ARCHIVE(dosmode))

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e09c23bfe1121d7b292e0d902f0325a5434bc042..2d9aefafa4522ab82d74cda16cc9d3b6f506f41c 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1407,7 +1407,7 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn,
                 */
                ret &= lp_directory_mask(SNUM(conn));
                /* Add in force bits */
-               ret |= lp_force_dir_mode(SNUM(conn));
+               ret |= lp_force_directory_mode(SNUM(conn));
        }
 
        *ret_perms = ret;

diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index 61cadf7be81175c10e2d417fe07d586bb262ee1d..4ff4b9e35396462aca5ed68bf72ef9893977e4fe 100644 (file)
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -150,7 +150,7 @@ static int sclassic_int_option(struct share_config *scfg, const char *opt_name,
        }
 
        if (strcmp(opt_name, SHARE_FORCE_DIR_MODE) == 0) {
-               return lpcfg_force_dir_mode(s, lpcfg_default_service(lp_ctx));
+               return lpcfg_force_directory_mode(s, lpcfg_default_service(lp_ctx));
        }
 
        if (strcmp(opt_name, SHARE_FORCE_CREATE_MODE) == 0) {