summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-04 15:09:11 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:16 -0800
commite3052c5bd94de2ae282c124685f17f5632e14b29 (patch)
tree5549e0f7f57086f39e60394b635295441918c29b
parent7cdcf131e8da6d750d103ded2fee009fe84d07fb (diff)
downloadsamba-e3052c5bd94de2ae282c124685f17f5632e14b29.tar.gz
samba-e3052c5bd94de2ae282c124685f17f5632e14b29.tar.xz
samba-e3052c5bd94de2ae282c124685f17f5632e14b29.zip
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>
-rw-r--r--lib/param/param_functions.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c2
-rw-r--r--source3/smbd/share_access.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 99393fed62..fd8337e6b7 100644
--- 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 7517f195a4..efb318548e 100644
--- 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 364773060e..9df88b42fc 100644
--- 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 dbe4c5b5d0..8b165e6c86 100644
--- 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;
}
}