From 904a2358327f7bf57b60a179b4d927bd16c162f5 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Mon, 3 Feb 2014 14:48:28 +1300 Subject: [PATCH] param: rename lp function and variable from 'force_dir_mode' to 'force_directory_mode' Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 2 +- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- source3/smbd/dosmode.c | 2 +- source3/smbd/trans2.c | 2 +- source4/param/share_classic.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index df9a3248bd4..f22bb552291 100644 --- 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 b81ad61bc4a..f1eb1156f59 100644 --- 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 66b1d438333..0724fb8c003 100644 --- 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 c6fd8a3fd77..28fbf4077a7 100644 --- 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 e0cf97c28a5..2a6b3fe9607 100644 --- 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 e09c23bfe11..2d9aefafa45 100644 --- 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 61cadf7be81..4ff4b9e3539 100644 --- 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) {