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 <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 2685df1177ffd39b1af34eb116bd7b24d4b12974)

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index d4e7d7e97ba1f70bc21ded1f24cca30a24547ef8..edb276bfb1fffccc38875b86732f358d846f64df 100644 (file)
--- 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 79978a1fb659700bd5923f08d8455a2aad9fb5d4..6407c9f5fafd206f0f3e122b3b7d32f14901edb4 100644 (file)
--- 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 6b36e6844c97df6e87a3e8ebbd022d80c1227e96..feb8415e82365d09bfc3f6a7b4b495bf4f225919 100644 (file)
--- 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));
 }