From d7a83ffdc92aa6249434619e6eb5a7cbb12ace33 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:03:20 +1300 Subject: [PATCH] param: Rename variable used for lp_force_dir_mode iDir_force_mode Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 74ccb34784c..d7933ee91f7 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -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")); diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index b160c100c23..4ec8cead3c4 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(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) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 4e154f01c29..3c5c7bf2640 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(iDir_force_mode), + .offset = LOCAL_VAR(force_dir_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 963fce8ea1b..57878dfcede 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, .dir_mask = 0755, - .iDir_force_mode = 0, + .force_dir_mode = 0, .max_connections = 0, .iDefaultCase = CASE_LOWER, .iPrinting = DEFAULT_PRINTING,