diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:10 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:15 -0800 |
| commit | 51f8a24d26e0e9358b8a87fdeecfebc80229de38 (patch) | |
| tree | 38ee9321fd7b592b4af1d22e65e0ca7bd3dfc8c1 | |
| parent | 63598ff628b874e3d4778939ac6f2b70292c9360 (diff) | |
| download | samba-51f8a24d26e0e9358b8a87fdeecfebc80229de38.tar.gz samba-51f8a24d26e0e9358b8a87fdeecfebc80229de38.tar.xz samba-51f8a24d26e0e9358b8a87fdeecfebc80229de38.zip | |
param: rename lp function and variable from "inherit_perms" to "inherit_permissions"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -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 |
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index db237c8c0b..6587b2d8e9 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -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) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index a14ab4b30c..9d25db6b93 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -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, 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)) { |