From 051cd1d83c462c6d07073ee60933086181fd5407 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 5 Aug 2014 18:45:24 +0200 Subject: [PATCH] server: remove duplicate snum_is_shared_printer() Only keep a single definition in server_reload.c Bug: https://bugzilla.samba.org/show_bug.cgi?id=10652 Signed-off-by: David Disseldorp Reviewed-by: Andreas Schneider (cherry picked from commit 2685df1177ffd39b1af34eb116bd7b24d4b12974) --- 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 d4e7d7e97ba..edb276bfb1f 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -4274,15 +4274,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_print_ok(snum)); -} - /******************************************************************** Spoolss_enumprinters. ********************************************************************/ diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 79978a1fb65..6407c9f5faf 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -956,6 +956,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 6b36e6844c9..feb8415e823 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_print_ok(snum)); } -- 2.11.4.GIT