summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/param/loadparm.c8
-rw-r--r--lib/param/loadparm.h2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/param/loadparm.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 3d50b727a63..0a1c29a129f 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -655,7 +655,7 @@ bool lpcfg_add_home(struct loadparm_context *lp_ctx,
if (!(*(service->comment))) {
service->comment = talloc_asprintf(service, "Home directory of %s", user);
}
- service->bAvailable = default_service->bAvailable;
+ service->available = default_service->available;
service->browseable = default_service->browseable;
DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n",
@@ -955,10 +955,10 @@ bool lpcfg_service_ok(struct loadparm_service *service)
{
DEBUG(0, ("WARNING: No path in service %s - making it unavailable!\n",
service->szService));
- service->bAvailable = false;
+ service->available = false;
}
- if (!service->bAvailable)
+ if (!service->available)
DEBUG(1, ("NOTE: Service %s is flagged unavailable.\n",
service->szService));
@@ -2420,7 +2420,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_ctx->flags = talloc_zero_array(lp_ctx, unsigned int, num_parameters());
lp_ctx->sDefault->max_print_jobs = 1000;
- lp_ctx->sDefault->bAvailable = true;
+ lp_ctx->sDefault->available = true;
lp_ctx->sDefault->browseable = true;
lp_ctx->sDefault->read_only = true;
lp_ctx->sDefault->map_archive = true;
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index de92cb81f21..8c443ef5a5f 100644
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -238,7 +238,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
char *szCopy; \
char *szService; \
char *szInclude; \
- bool bAvailable; \
+ bool available; \
struct parmlist_entry *param_opt; \
struct bitmap *copymap; \
char dummy[3]; /* for alignment */
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index c9a40f81be8..dcbd146d50f 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3307,7 +3307,7 @@ struct parm_struct parm_table[] = {
.label = "available",
.type = P_BOOL,
.p_class = P_LOCAL,
- .offset = LOCAL_VAR(bAvailable),
+ .offset = LOCAL_VAR(available),
.special = NULL,
.enum_list = NULL,
},
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4c9cd19ee6d..715362fb347 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -179,7 +179,7 @@ static struct loadparm_service sDefault =
.hide_unwriteable_files = false,
.browseable = true,
.access_based_share_enum = false,
- .bAvailable = true,
+ .available = true,
.read_only = true,
.spotlight = false,
.guest_only = false,
@@ -1457,7 +1457,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
string_set(ServicePtrs[i], &ServicePtrs[i]->comment, comment);
string_set(ServicePtrs[i], &ServicePtrs[i]->fstype, "IPC");
ServicePtrs[i]->max_connections = 0;
- ServicePtrs[i]->bAvailable = true;
+ ServicePtrs[i]->available = true;
ServicePtrs[i]->read_only = true;
ServicePtrs[i]->guest_only = false;
ServicePtrs[i]->administrative_share = true;
@@ -2630,7 +2630,7 @@ static void dump_copy_map(bool *pcopymap)
bool lp_snum_ok(int iService)
{
- return (LP_SNUM_OK(iService) && ServicePtrs[iService]->bAvailable);
+ return (LP_SNUM_OK(iService) && ServicePtrs[iService]->available);
}
/***************************************************************************