param: rename lp function and variable from "writelist" to "write_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 99393fed62bdc8e9f29dce5b0480835690181fcf..fd8337e6b7a45028c198e57b419613dd1203b375 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -71,7 +71,7 @@ FN_LOCAL_STRING(comment, comment)
 FN_LOCAL_STRING(force_user, force_user)
 FN_LOCAL_STRING(force_group, force_group)
 FN_LOCAL_LIST(read_list, read_list)
-FN_LOCAL_LIST(writelist, writelist)
+FN_LOCAL_LIST(write_list, write_list)
 FN_LOCAL_LIST(vfs_objects, vfs_objects)
 FN_LOCAL_STRING(msdfs_proxy, msdfs_proxy)
 FN_LOCAL_STRING(volume, volume)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7517f195a4c4030c0a490765fe37161fb1578a21..efb318548e66708302d5b639577b08bdf0c1eded 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -809,7 +809,7 @@ static struct parm_struct parm_table[] = {
                .label          = "write list",
                .type           = P_LIST,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(writelist),
+               .offset         = LOCAL_VAR(write_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 364773060e259a8caa482139f474a4f1b5c0958c..9df88b42fc399d53fb95aad991bddb209c808162 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -179,7 +179,7 @@ static struct loadparm_service sDefault =
        .force_user = NULL,
        .force_group = NULL,
        .read_list = NULL,
-       .writelist = NULL,
+       .write_list = NULL,
        .volume = NULL,
        .fstype = NULL,
        .vfs_objects = NULL,

diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index dbe4c5b5d0c99cc457b71211751bf689bc04883c..8b165e6c864df20ca94fca3390bc37c74cd428c1 100644 (file)
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -270,11 +270,11 @@ bool is_share_read_only_for_token(const char *username,
                }
        }
 
-       if (lp_writelist(snum) != NULL) {
+       if (lp_write_list(snum) != NULL) {
                if (token_contains_name_in_list(username, domain,
                                                lp_servicename(talloc_tos(), snum),
                                                token,
-                                               lp_writelist(snum))) {
+                                               lp_write_list(snum))) {
                        result = False;
                }
        }