sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

param: rename lp function and variable from "inherit_perms" to "inherit_permissions"

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-04 15:09:10 +13:00 committed by Jeremy Allison
parent 63598ff628
commit 51f8a24d26
6 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/param_functions.c
View File

@ -116,7 +116,7 @@ FN_LOCAL_BOOL(dos_filetimes, dos_filetimes)
FN_LOCAL_BOOL(dos_filetime_resolution, dos_filetime_resolution)
FN_LOCAL_BOOL(fake_directory_create_times, fake_directory_create_times)
FN_LOCAL_BOOL(blocking_locks, blocking_locks)
FN_LOCAL_BOOL(inherit_perms, inherit_perms)
FN_LOCAL_BOOL(inherit_permissions, inherit_permissions)
FN_LOCAL_BOOL(inherit_acls, inherit_acls)
FN_LOCAL_BOOL(inherit_owner, inherit_owner)
FN_LOCAL_BOOL(use_client_driver, use_client_driver)

2
lib/param/param_table.c
View File

@ -981,7 +981,7 @@ static struct parm_struct parm_table[] = {
.label = "inherit permissions",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(inherit_perms),
.offset = LOCAL_VAR(inherit_permissions),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE,

2
source3/param/loadparm.c
View File

@ -247,7 +247,7 @@ static struct loadparm_service sDefault =
.dos_filetime_resolution = false,
.fake_directory_create_times = false,
.blocking_locks = true,
.inherit_perms = false,
.inherit_permissions = false,
.inherit_acls = false,
.inherit_owner = false,
.msdfs_root = false,

2
source3/smbd/dosmode.c
View File

@ -116,7 +116,7 @@ mode_t unix_mode(connection_struct *conn, int dosmode,
result &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
}
if ((inherit_from_dir != NULL) && lp_inherit_perms(SNUM(conn))) {
if ((inherit_from_dir != NULL) && lp_inherit_permissions(SNUM(conn))) {
struct smb_filename *smb_fname_parent;
DEBUG(2, ("unix_mode(%s) inheriting from %s\n",

4
source3/smbd/open.c
View File

@ -871,7 +871,7 @@ static NTSTATUS open_file(files_struct *fsp,
in the stat struct in fsp->fsp_name. */
/* Inherit the ACL if required */
if (lp_inherit_perms(SNUM(conn))) {
if (lp_inherit_permissions(SNUM(conn))) {
inherit_access_posix_acl(conn, parent_dir,
smb_fname->base_name,
unx_mode);
@ -2962,7 +2962,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
}
}
if (lp_inherit_perms(SNUM(conn))) {
if (lp_inherit_permissions(SNUM(conn))) {
inherit_access_posix_acl(conn, parent_dir,
smb_dname->base_name, mode);
need_re_stat = true;

2
source3/smbd/trans2.c
View File

@ -7026,7 +7026,7 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
* don't want to end up with a half-constructed mknod.
*/
if (lp_inherit_perms(SNUM(conn))) {
if (lp_inherit_permissions(SNUM(conn))) {
char *parent;
if (!parent_dirname(talloc_tos(), smb_fname->base_name,
&parent, NULL)) {