[PATCH v2 7/9] server: remove duplicate snum_is_shared_printer()
David Disseldorp
ddiss at samba.org
Thu Aug 7 09:40:38 MDT 2014
Only keep a single definition in server_reload.c
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10652
Signed-off-by: David Disseldorp <ddiss at samba.org>
---
source3/rpc_server/spoolss/srv_spoolss_nt.c | 9 ---------
source3/smbd/proto.h | 1 +
source3/smbd/server_reload.c | 2 +-
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index b8cae89..391bb01 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -4289,15 +4289,6 @@ static WERROR construct_printer_info8(TALLOC_CTX *mem_ctx,
return WERR_OK;
}
-
-/********************************************************************
-********************************************************************/
-
-static bool snum_is_shared_printer(int snum)
-{
- return (lp_browseable(snum) && lp_snum_ok(snum) && lp_printable(snum));
-}
-
/********************************************************************
Spoolss_enumprinters.
********************************************************************/
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 22cd921..3905a74 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -955,6 +955,7 @@ const struct security_token *sec_ctx_active_token(void);
/* The following definitions come from smbd/server.c */
struct memcache *smbd_memcache(void);
+bool snum_is_shared_printer(int snum);
void delete_and_reload_printers(struct tevent_context *ev,
struct messaging_context *msg_ctx);
bool reload_services(struct smbd_server_connection *sconn,
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 1477f00..efcf294 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -38,7 +38,7 @@
*/
static time_t reload_last_pcap_time = 0;
-static bool snum_is_shared_printer(int snum)
+bool snum_is_shared_printer(int snum)
{
return (lp_browseable(snum) && lp_snum_ok(snum) && lp_printable(snum));
}
--
1.8.4.5
More information about the samba-technical
mailing list