diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/dosmode.c | 2 | ||||
| -rw-r--r-- | source3/smbd/open.c | 4 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8e3a9b562f..53d7370e13 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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, diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 2a6b3fe960..831f6d0b6d 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -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", diff --git a/source3/smbd/open.c b/source3/smbd/open.c index ecc84b910f..f995c0bcae 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -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; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 288ea9ae5b..8dc5b23387 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -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)) { |