param: rename lp function and variable from "readlist" to "read_list"

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 5876e62a0b977e78f5f7204a5e361c6bf24606a6..0483c1461d3fec6fe39dbc7785d3950a0d3d6976 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -70,7 +70,7 @@ FN_LOCAL_STRING(magic_output, magic_output)
 FN_LOCAL_STRING(comment, comment)
 FN_LOCAL_STRING(force_user, force_user)
 FN_LOCAL_STRING(force_group, force_group)
-FN_LOCAL_LIST(readlist, readlist)
+FN_LOCAL_LIST(read_list, read_list)
 FN_LOCAL_LIST(writelist, writelist)
 FN_LOCAL_LIST(vfs_objects, vfs_objects)
 FN_LOCAL_STRING(msdfs_proxy, msdfs_proxy)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 6d07f40d6cbb5f76a16a75bf8fe57f70c3a3c69e..7616bbefb4ec272abeb5584a88800b0d22607863 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -800,7 +800,7 @@ static struct parm_struct parm_table[] = {
                .label          = "read list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(readlist),
+               .offset         = LOCAL_VAR(read_list),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e3e4df4c6d9a6d8e363bdfe08986938934025088..9df05b68791a930aed3ddd895d7017cf5bcbbf46 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -178,7 +178,7 @@ static struct loadparm_service sDefault =
        .comment = NULL,
        .force_user = NULL,
        .force_group = NULL,
-       .readlist = NULL,
+       .read_list = NULL,
        .writelist = NULL,
        .volume = NULL,
        .fstype = NULL,

diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index c9e93ac45f907faba2fa8ebd6195842f326d188d..dbe4c5b5d0c99cc457b71211751bf689bc04883c 100644 (file)
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -261,11 +261,11 @@ bool is_share_read_only_for_token(const char *username,
        int snum = SNUM(conn);
        bool result = conn->read_only;
 
-       if (lp_readlist(snum) != NULL) {
+       if (lp_read_list(snum) != NULL) {
                if (token_contains_name_in_list(username, domain,
                                                lp_servicename(talloc_tos(), snum),
                                                token,
-                                               lp_readlist(snum))) {
+                                               lp_read_list(snum))) {
                        result = True;
                }
        }