From e3052c5bd94de2ae282c124685f17f5632e14b29 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:09:11 +1300 Subject: [PATCH] param: rename lp function and variable from "writelist" to "write_list" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- source3/smbd/share_access.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 99393fed62b..fd8337e6b7a 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 7517f195a4c..efb318548e6 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 364773060e2..9df88b42fc3 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 dbe4c5b5d0c..8b165e6c864 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; } } -- 2.11.4.GIT