sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

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

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-03 14:48:28 +13:00 committed by Jeremy Allison
parent 17adbbcad7
commit 904a235832
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/loadparm.c
View File

@ -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"));

2
lib/param/param_functions.c
View 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(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)

2
lib/param/param_table.c
View 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(force_dir_mode),
.offset = LOCAL_VAR(force_directory_mode),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,

2
source3/param/loadparm.c
View File

@ -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,

2
source3/smbd/dosmode.c
View File

@ -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))

2
source3/smbd/trans2.c
View File

@ -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;

2
source4/param/share_classic.c
View File

@ -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) {