diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 5b7ed1c6460..f407fb2783a 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -791,7 +791,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx, /* Printers cannot be read_only. */ service->readonly = false; /* Printer services must be printable. */ - service->bPrint_ok = true; + service->print_ok = true; DEBUG(3, ("adding printer service %s\n", pszPrintername)); @@ -1011,10 +1011,10 @@ static bool lpcfg_service_ok(struct loadparm_service *service) /* The [printers] entry MUST be printable. I'm all for flexibility, but */ /* I can't see why you'd want a non-printable printer service... */ if (strwicmp(service->szService, PRINTERS_NAME) == 0) { - if (!service->bPrint_ok) { + if (!service->print_ok) { DEBUG(0, ("WARNING: [%s] service MUST be printable!\n", service->szService)); - service->bPrint_ok = true; + service->print_ok = true; } /* [printers] service must also be non-browsable. */ if (service->browseable) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 48f83dec7e1..2c8285b6762 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -35,7 +35,7 @@ FN_LOCAL_LIST(ntvfs_handler, ntvfs_handler) FN_LOCAL_BOOL(msdfs_root, msdfs_root) FN_LOCAL_BOOL(browseable, browseable) FN_LOCAL_BOOL(readonly, readonly) -FN_LOCAL_BOOL(print_ok, bPrint_ok) +FN_LOCAL_BOOL(print_ok, print_ok) FN_LOCAL_BOOL(map_hidden, bMap_hidden) FN_LOCAL_BOOL(map_archive, bMap_archive) FN_LOCAL_BOOL(oplocks, bOpLocks) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index c6fc2ce958a..0348948e694 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2076,7 +2076,7 @@ static struct parm_struct parm_table[] = { .label = "printable", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(bPrint_ok), + .offset = LOCAL_VAR(print_ok), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT, @@ -2094,7 +2094,7 @@ static struct parm_struct parm_table[] = { .label = "print ok", .type = P_BOOL, .p_class = P_LOCAL, - .offset = LOCAL_VAR(bPrint_ok), + .offset = LOCAL_VAR(print_ok), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7b2fe9bc124..ebedc018424 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -217,7 +217,7 @@ static struct loadparm_service sDefault = .bGuest_only = false, .bAdministrative_share = false, .bGuest_ok = false, - .bPrint_ok = false, + .print_ok = false, .bPrintNotifyBackchannel = false, .bMap_system = false, .bMap_hidden = false, @@ -1746,7 +1746,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok) ServicePtrs[i]->bGuest_only = false; ServicePtrs[i]->bAdministrative_share = true; ServicePtrs[i]->bGuest_ok = guest_ok; - ServicePtrs[i]->bPrint_ok = false; + ServicePtrs[i]->print_ok = false; ServicePtrs[i]->browseable = sDefault.browseable; DEBUG(3, ("adding IPC service\n")); @@ -1784,7 +1784,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService) /* No oplocks on printer services. */ ServicePtrs[i]->bOpLocks = false; /* Printer services must be printable. */ - ServicePtrs[i]->bPrint_ok = true; + ServicePtrs[i]->print_ok = true; DEBUG(3, ("adding printer service %s\n", pszPrintername)); @@ -2337,10 +2337,10 @@ bool service_ok(int iService) /* The [printers] entry MUST be printable. I'm all for flexibility, but */ /* I can't see why you'd want a non-printable printer service... */ if (strwicmp(ServicePtrs[iService]->szService, PRINTERS_NAME) == 0) { - if (!ServicePtrs[iService]->bPrint_ok) { + if (!ServicePtrs[iService]->print_ok) { DEBUG(0, ("WARNING: [%s] service MUST be printable!\n", ServicePtrs[iService]->szService)); - ServicePtrs[iService]->bPrint_ok = true; + ServicePtrs[iService]->print_ok = true; } /* [printers] service must also be non-browsable. */ if (ServicePtrs[iService]->browseable)