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>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index db237c8c0bf62bbb07b592972aafb54d55dd9e93..6587b2d8e92f2fc825f9d3444e2decf46a2e5e7f 100644 (file)
--- 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 a14ab4b30cfc1b6f27c92c1f0d506617c1ddc04f..9d25db6b932329b7a76d88ab73b08ebadc52423a 100644 (file)
--- 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 8e3a9b562f5de9bdeacd8478aa947cf7f8b2adf1..53d7370e13be365696d7b374bd4bc4b2151b4e06 100644 (file)
--- 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 2a6b3fe9607c1ceea1460c3b9b85ac8373e41f13..831f6d0b6dec929dac8f675ebfbbcb803b8b1522 100644 (file)
--- 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 ecc84b910fe0ce7e4e4782d567de3852b02c099b..f995c0bcae00f1188b00d61343881426c7b55e31 100644 (file)
--- 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 288ea9ae5b61dfa17e90742916fb687b797458b5..8dc5b2338768d7bc6654db7a707b6e326c5dc66b 100644 (file)
--- 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)) {