loadparm: rename variable for "printable" from print_ok to printable

for consistency docs/funcstions/variables

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 81d8d1f010b2fdf3fc3f47da768f0cbea5a8ae12..263f585e235a41f2ab6cc6223815330e1bea3d36 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -789,7 +789,7 @@ bool lpcfg_add_printer(struct loadparm_context *lp_ctx,
        /* Printers cannot be read_only. */
        service->read_only = false;
        /* Printer services must be printable. */
-       service->print_ok = true;
+       service->printable = 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->print_ok) {
+               if (!service->printable) {
                        DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
                               service->szService));
-                       service->print_ok = true;
+                       service->printable = 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 7c97af16f404a364a8753e5a727d4ea51c455aae..142eb62e772d99cdd8ed4ff1f4359eff64309e76 100644 (file)
--- 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(read_only, read_only)
-FN_LOCAL_BOOL(printable, print_ok)
+FN_LOCAL_BOOL(printable, printable)
 FN_LOCAL_BOOL(map_hidden, map_hidden)
 FN_LOCAL_BOOL(map_archive, map_archive)
 FN_LOCAL_BOOL(oplocks, oplocks)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 7ff9b339781cfba7208d969411013bbdac4d1e73..6b4052f6bf80a9742239b7998025f59836745a35 100644 (file)
--- 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(print_ok),
+               .offset         = LOCAL_VAR(printable),
                .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(print_ok),
+               .offset         = LOCAL_VAR(printable),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_HIDE,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 019406bc4e4622ccd360a62c0b349a50d2c10e05..3e7883882028874641c2484d21a93b56a29fa546 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -217,7 +217,7 @@ static struct loadparm_service sDefault =
        .guest_only = false,
        .administrative_share = false,
        .guest_ok = false,
-       .print_ok = false,
+       .printable = false,
        .print_notify_backchannel = false,
        .map_system = false,
        .map_hidden = false,
@@ -1794,7 +1794,7 @@ static bool lp_add_ipc(const char *ipc_name, bool guest_ok)
        ServicePtrs[i]->guest_only = false;
        ServicePtrs[i]->administrative_share = true;
        ServicePtrs[i]->guest_ok = guest_ok;
-       ServicePtrs[i]->print_ok = false;
+       ServicePtrs[i]->printable = false;
        ServicePtrs[i]->browseable = sDefault.browseable;
 
        DEBUG(3, ("adding IPC service\n"));
@@ -1832,7 +1832,7 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
        /* No oplocks on printer services. */
        ServicePtrs[i]->oplocks = false;
        /* Printer services must be printable. */
-       ServicePtrs[i]->print_ok = true;
+       ServicePtrs[i]->printable = true;
 
        DEBUG(3, ("adding printer service %s\n", pszPrintername));
 
@@ -2360,10 +2360,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]->print_ok) {
+               if (!ServicePtrs[iService]->printable) {
                        DEBUG(0, ("WARNING: [%s] service MUST be printable!\n",
                               ServicePtrs[iService]->szService));
-                       ServicePtrs[iService]->print_ok = true;
+                       ServicePtrs[iService]->printable = true;
                }
                /* [printers] service must also be non-browsable. */
                if (ServicePtrs[iService]->browseable)