sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

param: Rename variable used for lp_browseable bBrowseable

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andrew Bartlett 2013-12-24 16:03:17 +13:00 committed by Jeremy Allison
parent 03f3359709
commit d7b18d1e56
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/param/loadparm.c
View File

@ -756,7 +756,7 @@ bool lpcfg_add_home(struct loadparm_context *lp_ctx,
service->comment = talloc_asprintf(service, "Home directory of %s", user);
}
service->bAvailable = default_service->bAvailable;
service->bBrowseable = default_service->bBrowseable;
service->browseable = default_service->browseable;
DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n",
pszHomename, user, service->pathname));
@ -787,7 +787,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
/* the printer name is set to the service name. */
lpcfg_string_set(service, &service->szPrintername, pszPrintername);
lpcfg_string_set(service, &service->comment, comment);
service->bBrowseable = default_service->bBrowseable;
service->browseable = default_service->browseable;
/* Printers cannot be read_only. */
service->bRead_only = false;
/* Printer services must be printable. */
@ -1017,8 +1017,8 @@ static bool lpcfg_service_ok(struct loadparm_service *service)
service->bPrint_ok = true;
}
/* [printers] service must also be non-browsable. */
if (service->bBrowseable)
service->bBrowseable = false;
if (service->browseable)
service->browseable = false;
}
/* If a service is flagged unavailable, log the fact at level 0. */
@ -2050,7 +2050,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lp_ctx->sDefault->iMaxPrintJobs = 1000;
lp_ctx->sDefault->bAvailable = true;
lp_ctx->sDefault->bBrowseable = true;
lp_ctx->sDefault->browseable = true;
lp_ctx->sDefault->bRead_only = true;
lp_ctx->sDefault->bMap_archive = true;
lp_ctx->sDefault->iStrictLocking = true;

2
lib/param/param_functions.c
View File

@ -33,7 +33,7 @@ FN_LOCAL_LIST(hostsdeny, hostsdeny)
FN_LOCAL_STRING(fstype, fstype)
FN_LOCAL_LIST(ntvfs_handler, ntvfs_handler)
FN_LOCAL_BOOL(msdfs_root, msdfs_root)
FN_LOCAL_BOOL(browseable, bBrowseable)
FN_LOCAL_BOOL(browseable, browseable)
FN_LOCAL_BOOL(readonly, bRead_only)
FN_LOCAL_BOOL(print_ok, bPrint_ok)
FN_LOCAL_BOOL(map_hidden, bMap_hidden)

4
lib/param/param_table.c
View File

@ -2851,7 +2851,7 @@ static struct parm_struct parm_table[] = {
.label = "browseable",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bBrowseable),
.offset = LOCAL_VAR(browseable),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT,
@ -2860,7 +2860,7 @@ static struct parm_struct parm_table[] = {
.label = "browsable",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bBrowseable),
.offset = LOCAL_VAR(browseable),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_HIDE,

12
source3/param/loadparm.c
View File

@ -210,7 +210,7 @@ static struct loadparm_service sDefault =
.bHideSpecialFiles = false,
.bHideUnReadable = false,
.bHideUnWriteableFiles = false,
.bBrowseable = true,
.browseable = true,
.bAccessBasedShareEnum = false,
.bAvailable = true,
.bRead_only = true,
@ -1695,7 +1695,7 @@ bool lp_add_home(const char *pszHomename, int iDefaultService,
/* set the browseable flag from the global default */
ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
ServicePtrs[i]->browseable = sDefault.browseable;
ServicePtrs[i]->bAccessBasedShareEnum = sDefault.bAccessBasedShareEnum;
ServicePtrs[i]->autoloaded = true;
@ -1747,7 +1747,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
ServicePtrs[i]->bAdministrative_share = true;
ServicePtrs[i]->bGuest_ok = guest_ok;
ServicePtrs[i]->bPrint_ok = false;
ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
ServicePtrs[i]->browseable = sDefault.browseable;
DEBUG(3, ("adding IPC service\n"));
@ -1777,7 +1777,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
string_set(&ServicePtrs[i]->comment, comment);
/* set the browseable flag from the gloabl default */
ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
ServicePtrs[i]->browseable = sDefault.browseable;
/* Printers cannot be read_only. */
ServicePtrs[i]->bRead_only = false;
@ -2343,8 +2343,8 @@ bool service_ok(int iService)
ServicePtrs[iService]->bPrint_ok = true;
}
/* [printers] service must also be non-browsable. */
if (ServicePtrs[iService]->bBrowseable)
ServicePtrs[iService]->bBrowseable = false;
if (ServicePtrs[iService]->browseable)
ServicePtrs[iService]->browseable = false;
}
if (ServicePtrs[iService]->pathname[0] == '\0' &&