diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-08-05 18:45:24 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-08-08 14:10:39 +0200 |
| commit | 2685df1177ffd39b1af34eb116bd7b24d4b12974 (patch) | |
| tree | 188e65a9e18f4d3df62393ae94fd0b94ac2dbc9a /source3 | |
| parent | a2182e03a061de6c1f111ce083cb5f668fe75e4e (diff) | |
| download | samba-2685df1177ffd39b1af34eb116bd7b24d4b12974.tar.gz samba-2685df1177ffd39b1af34eb116bd7b24d4b12974.tar.xz samba-2685df1177ffd39b1af34eb116bd7b24d4b12974.zip | |
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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 9 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 1 | ||||
| -rw-r--r-- | 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 b8cae89e97..391bb01d3e 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 22cd921694..3905a742a9 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 1477f00c96..efcf294553 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)); } |