From 0cdb0f899809b624b5b5b234acdf974ac14a8d13 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 2 Feb 2014 14:44:05 +0100 Subject: [PATCH] loadparm: rename variable for "read only" from readonly to read_only for consistency docs/functions/variables Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- lib/param/loadparm.c | 4 ++-- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 8 ++++---- source3/param/loadparm.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 58712a52482..81d8d1f010b 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -787,7 +787,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx, lpcfg_string_set(service, &service->comment, comment); service->browseable = default_service->browseable; /* Printers cannot be read_only. */ - service->readonly = false; + service->read_only = false; /* Printer services must be printable. */ service->print_ok = true; @@ -2008,7 +2008,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_ctx->sDefault->iMaxPrintJobs = 1000; lp_ctx->sDefault->bAvailable = true; lp_ctx->sDefault->browseable = true; - lp_ctx->sDefault->readonly = true; + lp_ctx->sDefault->read_only = true; lp_ctx->sDefault->map_archive = true; lp_ctx->sDefault->strict_locking = true; lp_ctx->sDefault->oplocks = true; diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index afba56b6d8f..31b2beec417 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -34,7 +34,7 @@ FN_LOCAL_STRING(fstype, fstype) FN_LOCAL_LIST(ntvfs_handler, ntvfs_handler) FN_LOCAL_BOOL(msdfs_root, msdfs_root) FN_LOCAL_BOOL(browseable, browseable) -FN_LOCAL_BOOL(read_only, readonly) +FN_LOCAL_BOOL(read_only, read_only) FN_LOCAL_BOOL(print_ok, print_ok) FN_LOCAL_BOOL(map_hidden, map_hidden) FN_LOCAL_BOOL(map_archive, map_archive) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index d3782544ee7..7ff9b339781 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -845,7 +845,7 @@ static struct parm_struct parm_table[] = { .label = "read only", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(readonly), + .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE, @@ -854,7 +854,7 @@ static struct parm_struct parm_table[] = { .label = "write ok", .type = P_BOOLREV, .p_class = P_LOCAL, - .offset = LOCAL_VAR(readonly), + .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, @@ -863,7 +863,7 @@ static struct parm_struct parm_table[] = { .label = "writeable", .type = P_BOOLREV, .p_class = P_LOCAL, - .offset = LOCAL_VAR(readonly), + .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, @@ -872,7 +872,7 @@ static struct parm_struct parm_table[] = { .label = "writable", .type = P_BOOLREV, .p_class = P_LOCAL, - .offset = LOCAL_VAR(readonly), + .offset = LOCAL_VAR(read_only), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d9690c88418..019406bc4e4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -213,7 +213,7 @@ static struct loadparm_service sDefault = .browseable = true, .access_based_share_enum = false, .bAvailable = true, - .readonly = true, + .read_only = true, .guest_only = false, .administrative_share = false, .guest_ok = false, @@ -1790,7 +1790,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok) string_set(&ServicePtrs[i]->fstype, "IPC"); ServicePtrs[i]->max_connections = 0; ServicePtrs[i]->bAvailable = true; - ServicePtrs[i]->readonly = true; + ServicePtrs[i]->read_only = true; ServicePtrs[i]->guest_only = false; ServicePtrs[i]->administrative_share = true; ServicePtrs[i]->guest_ok = guest_ok; @@ -1828,7 +1828,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService) ServicePtrs[i]->browseable = sDefault.browseable; /* Printers cannot be read_only. */ - ServicePtrs[i]->readonly = false; + ServicePtrs[i]->read_only = false; /* No oplocks on printer services. */ ServicePtrs[i]->oplocks = false; /* Printer services must be printable. */ @@ -4255,7 +4255,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i added_service = true; /* Read only is controlled by usershare ACL below. */ - ServicePtrs[iService]->readonly = false; + ServicePtrs[iService]->read_only = false; } /* Write the ACL of the new/modified share. */ -- 2.11.4.GIT