summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-02-10 14:00:05 +0100
committerAndreas Schneider <asn@cryptomilk.org>2012-03-14 17:56:14 +0100
commitfd85cd25e088bfd0bd304e980fa8776cf8ca376d (patch)
tree4a2ffe4c0ab49a193651be151f26350bd1040b58
parent1a65f90a341752e5b6c9b3f7e8f301bb4a093d65 (diff)
downloadsamba-fd85cd25e088bfd0bd304e980fa8776cf8ca376d.tar.gz
samba-fd85cd25e088bfd0bd304e980fa8776cf8ca376d.tar.bz2
samba-fd85cd25e088bfd0bd304e980fa8776cf8ca376d.zip
s3-printing: Check for browseable too.
-rw-r--r--source3/smbd/server_reload.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 6d4b8765d8..f9891de218 100644
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -31,6 +31,11 @@
#include "messages.h"
#include "lib/param/loadparm.h"
+static bool snum_is_shared_printer(int snum)
+{
+ return (lp_browseable(snum) && lp_snum_ok(snum) && lp_print_ok(snum));
+}
+
/**
* @brief Purge stale printers and reload from pre-populated pcap cache.
*
@@ -85,7 +90,7 @@ void delete_and_reload_printers(struct tevent_context *ev,
}
/* skip no-printer services */
- if (!(lp_snum_ok(snum) && lp_print_ok(snum))) {
+ if (!snum_is_shared_printer(snum)) {
continue;
}