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

loadparm: rename lp[cfg]_dir_mask to lp[cfg]_directory_mask for consistency with docs

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Michael Adam 2014-02-02 14:59:30 +01:00 committed by Andrew Bartlett
parent 4b403e912d
commit 43d59d5cc4
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -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(dir_mask, dir_mask)
FN_LOCAL_INTEGER(directory_mask, dir_mask)
FN_LOCAL_INTEGER(force_dir_mode, force_dir_mode)
FN_LOCAL_STRING(preexec, preexec)
FN_LOCAL_STRING(postexec, postexec)

2
source3/modules/vfs_default.c
View File

@ -437,7 +437,7 @@ static int vfswrap_mkdir(vfs_handle_struct *handle, const char *path, mode_t mod
if (lp_inherit_acls(SNUM(handle->conn))
&& parent_dirname(talloc_tos(), path, &parent, NULL)
&& (has_dacl = directory_has_default_acl(handle->conn, parent)))
mode = (0777 & lp_dir_mask(SNUM(handle->conn)));
mode = (0777 & lp_directory_mask(SNUM(handle->conn)));
TALLOC_FREE(parent);

2
source3/smbd/dosmode.c
View File

@ -162,7 +162,7 @@ mode_t unix_mode(connection_struct *conn, int dosmode,
result |= (S_IXUSR | S_IXGRP | S_IXOTH);
/* Apply directory mask */
result &= lp_dir_mask(SNUM(conn));
result &= lp_directory_mask(SNUM(conn));
/* Add in force bits */
result |= lp_force_dir_mode(SNUM(conn));
}

2
source3/smbd/trans2.c
View File

@ -1405,7 +1405,7 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn,
* "directory mask"/"force directory mode" are
* only applied to new directories, not existing ones.
*/
ret &= lp_dir_mask(SNUM(conn));
ret &= lp_directory_mask(SNUM(conn));
/* Add in force bits */
ret |= lp_force_dir_mode(SNUM(conn));
}

2
source4/param/share_classic.c
View File

@ -146,7 +146,7 @@ static int sclassic_int_option(struct share_config *scfg, const char *opt_name,
}
if (strcmp(opt_name, SHARE_DIR_MASK) == 0) {
return lpcfg_dir_mask(s, lpcfg_default_service(lp_ctx));
return lpcfg_directory_mask(s, lpcfg_default_service(lp_ctx));
}
if (strcmp(opt_name, SHARE_FORCE_DIR_MODE) == 0) {