From 4286e147a62af784f4661cdd9d668e4d86cba4f2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 2 Feb 2014 14:48:41 +0100
Subject: [PATCH] loadparm: rename lp[cfg]_print_ok to lp[cfg]_printable for
 consistency with docs

Signed-off-by: Michael Adam <obnox@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
---
 lib/param/param_functions.c                 | 2 +-
 source3/include/smb_macros.h                | 2 +-
 source3/printing/notify.c                   | 2 +-
 source3/printing/nt_printing.c              | 2 +-
 source3/printing/nt_printing_ads.c          | 2 +-
 source3/printing/printing.c                 | 8 ++++----
 source3/rpc_server/spoolss/srv_spoolss_nt.c | 8 ++++----
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c   | 6 +++---
 source3/rpc_server/winreg/srv_winreg_nt.c   | 2 +-
 source3/smbd/lanman.c                       | 2 +-
 source3/smbd/server_reload.c                | 2 +-
 source3/smbd/service.c                      | 6 +++---
 source4/param/share_classic.c               | 2 +-
 13 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 31b2beec417..7c97af16f40 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(read_only, read_only)
-FN_LOCAL_BOOL(print_ok, print_ok)
+FN_LOCAL_BOOL(printable, print_ok)
 FN_LOCAL_BOOL(map_hidden, map_hidden)
 FN_LOCAL_BOOL(map_archive, map_archive)
 FN_LOCAL_BOOL(oplocks, oplocks)
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index ff3aced7553..cd47950cca1 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -72,7 +72,7 @@
 #define VALID_SNUM(snum)   (lp_snum_ok(snum))
 #define GUEST_OK(snum)     (VALID_SNUM(snum) && lp_guest_ok(snum))
 #define GUEST_ONLY(snum)   (VALID_SNUM(snum) && lp_guest_only(snum))
-#define CAN_PRINT(conn)    ((conn) && lp_print_ok(SNUM(conn)))
+#define CAN_PRINT(conn)    ((conn) && lp_printable(SNUM(conn)))
 #define MAP_HIDDEN(conn)   ((conn) && lp_map_hidden(SNUM(conn)))
 #define MAP_SYSTEM(conn)   ((conn) && lp_map_system(SNUM(conn)))
 #define MAP_ARCHIVE(conn)   ((conn) && lp_map_archive(SNUM(conn)))
diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 4040a2bab4d..9468f0afbae 100644
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -62,7 +62,7 @@ static bool create_send_ctx(void)
 int print_queue_snum(const char *qname)
 {
 	int snum = lp_servicenumber(qname);
-	if (snum == -1 || !lp_print_ok(snum))
+	if (snum == -1 || !lp_printable(snum))
 		return -1;
 	return snum;
 }
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 9b0fcdccfc8..376dcfafa82 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1262,7 +1262,7 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
 	/* loop through the printers.tdb and check for the drivername */
 
 	for (snum=0; snum<n_services && !in_use; snum++) {
-		if (!lp_snum_ok(snum) || !lp_print_ok(snum)) {
+		if (!lp_snum_ok(snum) || !lp_printable(snum)) {
 			continue;
 		}
 
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 5d5f5646da5..5a5a17751d8 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -533,7 +533,7 @@ WERROR check_published_printers(struct messaging_context *msg_ctx)
 	}
 
 	for (snum = 0; snum < n_services; snum++) {
-		if (!lp_snum_ok(snum) || !lp_print_ok(snum)) {
+		if (!lp_snum_ok(snum) || !lp_printable(snum)) {
 			continue;
 		}
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 2f23607980a..f9406f27e57 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -214,7 +214,7 @@ bool print_backend_init(struct messaging_context *msg_ctx)
 
 	for (snum = 0; snum < services; snum++) {
 		struct tdb_print_db *pdb;
-		if (!lp_print_ok(snum))
+		if (!lp_printable(snum))
 			continue;
 
 		pdb = get_print_db_byname(lp_const_servicename(snum));
@@ -547,7 +547,7 @@ uint32 sysjob_to_jobid(int unix_jobid)
 
 	for (snum = 0; snum < services; snum++) {
 		struct tdb_print_db *pdb;
-		if (!lp_print_ok(snum))
+		if (!lp_printable(snum))
 			continue;
 		pdb = get_print_db_byname(lp_const_servicename(snum));
 		if (!pdb) {
@@ -1800,7 +1800,7 @@ bool print_notify_register_pid(int snum)
 		int idx;
 
 		for ( idx=0; idx<num_services; idx++ ) {
-			if (lp_snum_ok(idx) && lp_print_ok(idx) )
+			if (lp_snum_ok(idx) && lp_printable(idx) )
 				print_notify_register_pid(idx);
 		}
 
@@ -1890,7 +1890,7 @@ bool print_notify_deregister_pid(int snum)
 		int idx;
 
 		for ( idx=0; idx<num_services; idx++ ) {
-			if ( lp_snum_ok(idx) && lp_print_ok(idx) )
+			if ( lp_snum_ok(idx) && lp_printable(idx) )
 				print_notify_deregister_pid(idx);
 		}
 
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index cae3cddf43a..c1d4dc04355 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -653,7 +653,7 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx,
 		const char *printer = lp_const_servicename(snum);
 
 		/* no point going on if this is not a printer */
-		if (!(lp_snum_ok(snum) && lp_print_ok(snum))) {
+		if (!(lp_snum_ok(snum) && lp_printable(snum))) {
 			continue;
 		}
 
@@ -1547,7 +1547,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg,
 	/* Iterate the printer list */
 
 	for (snum = 0; snum < n_services; snum++) {
-		if (!lp_snum_ok(snum) || !lp_print_ok(snum)) {
+		if (!lp_snum_ok(snum) || !lp_printable(snum)) {
 			continue;
 		}
 
@@ -3543,7 +3543,7 @@ static WERROR printserver_notify_info(struct pipes_struct *p,
 		for (snum = 0; snum < n_services; snum++) {
 			if (!lp_browseable(snum) ||
 			    !lp_snum_ok(snum) ||
-			    !lp_print_ok(snum)) {
+			    !lp_printable(snum)) {
 				continue; /* skip */
 			}
 
@@ -4290,7 +4290,7 @@ static WERROR construct_printer_info8(TALLOC_CTX *mem_ctx,
 
 static bool snum_is_shared_printer(int snum)
 {
-	return (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum));
+	return (lp_browseable(snum) && lp_snum_ok(snum) && lp_printable(snum));
 }
 
 /********************************************************************
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 6058ac9e776..996bbdde74b 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -166,7 +166,7 @@ static enum srvsvc_ShareType get_share_type(int snum)
 	/* work out the share type */
 	enum srvsvc_ShareType type = STYPE_DISKTREE;
 
-	if (lp_print_ok(snum)) {
+	if (lp_printable(snum)) {
 		type = lp_administrative_share(snum)
 			? STYPE_PRINTQ_HIDDEN : STYPE_PRINTQ;
 	}
@@ -1545,7 +1545,7 @@ WERROR _srvsvc_NetShareSetInfo(struct pipes_struct *p,
 		return WERR_NET_NAME_NOT_FOUND;
 
 	/* No change to printer shares. */
-	if (lp_print_ok(snum))
+	if (lp_printable(snum))
 		return WERR_ACCESS_DENIED;
 
 	is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR);
@@ -1954,7 +1954,7 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
 	}
 
 	/* No change to printer shares. */
-	if (lp_print_ok(snum))
+	if (lp_printable(snum))
 		return WERR_ACCESS_DENIED;
 
 	is_disk_op = security_token_has_privilege(p->session_info->security_token, SEC_PRIV_DISK_OPERATOR);
diff --git a/source3/rpc_server/winreg/srv_winreg_nt.c b/source3/rpc_server/winreg/srv_winreg_nt.c
index c2f2b5385a3..40362fa71d6 100644
--- a/source3/rpc_server/winreg/srv_winreg_nt.c
+++ b/source3/rpc_server/winreg/srv_winreg_nt.c
@@ -659,7 +659,7 @@ static int validate_reg_filename(TALLOC_CTX *ctx, char **pp_fname )
 	/* has to exist within a valid file share */
 
 	for (snum=0; snum<num_services; snum++) {
-		if (!lp_snum_ok(snum) || lp_print_ok(snum)) {
+		if (!lp_snum_ok(snum) || lp_printable(snum)) {
 			continue;
 		}
 
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index d0cf6ad3785..9ff250f5c0f 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1945,7 +1945,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
 
 		SCVAL(p,13,0);
 		type = STYPE_DISKTREE;
-		if (lp_print_ok(snum)) {
+		if (lp_printable(snum)) {
 			type = STYPE_PRINTQ;
 		}
 		if (strequal("IPC",lp_fstype(talloc_tos(),snum))) {
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 1d6f9c2911f..795f9f04954 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -33,7 +33,7 @@
 
 static bool snum_is_shared_printer(int snum)
 {
-	return (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum));
+	return (lp_browseable(snum) && lp_snum_ok(snum) && lp_printable(snum));
 }
 
 /**
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index dad24ec5819..8af85afec79 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -254,7 +254,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
 	}
 
 	if (dev[0] == '?' || !dev[0]) {
-		if (lp_print_ok(snum)) {
+		if (lp_printable(snum)) {
 			fstrcpy(dev,"LPT1:");
 		} else if (strequal(lp_fstype(talloc_tos(), snum), "IPC")) {
 			fstrcpy(dev, "IPC");
@@ -268,7 +268,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	if (lp_print_ok(snum)) {
+	if (lp_printable(snum)) {
 		if (!strequal(dev, "LPT1:")) {
 			return NT_STATUS_BAD_DEVICE_TYPE;
 		}
@@ -281,7 +281,7 @@ static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address
 	}
 
 	/* Behave as a printer if we are supposed to */
-	if (lp_print_ok(snum) && (strcmp(dev, "A:") == 0)) {
+	if (lp_printable(snum) && (strcmp(dev, "A:") == 0)) {
 		fstrcpy(dev, "LPT1:");
 	}
 
diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index 17afa175252..c78990ec34e 100644
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -88,7 +88,7 @@ static const char *sclassic_string_option(struct share_config *scfg,
 	}
 
 	if (strcmp(opt_name, SHARE_TYPE) == 0) {
-		if (lpcfg_print_ok(s, lpcfg_default_service(lp_ctx))) {
+		if (lpcfg_printable(s, lpcfg_default_service(lp_ctx))) {
 			return "PRINTER";
 		}
 		if (strcmp("NTFS", lpcfg_fstype(s, lpcfg_default_service(lp_ctx))) == 0) {
-- 
2.11.4.GIT