diff options
| author | Andreas Schneider <asn@samba.org> | 2011-09-01 14:25:07 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-05 11:18:23 +0200 |
| commit | ad3734194991f55492b92a6330f055c10e6fd1e1 (patch) | |
| tree | eeeb40e70c6653a12a9bc094440700bfd911b887 | |
| parent | 1316bc4b081c1b3b8499ac2b699be29dca247331 (diff) | |
| download | samba-ad3734194991f55492b92a6330f055c10e6fd1e1.tar.gz samba-ad3734194991f55492b92a6330f055c10e6fd1e1.tar.bz2 samba-ad3734194991f55492b92a6330f055c10e6fd1e1.zip | |
s3-spoolssd: Remove stale printers only on a valid pcap update.
load_printers() removes stale printers and we should only remove them if
we have a CUPS connection and talked to cups. Else we will remove every
configured printer if cups is not available.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Mon Sep 5 11:18:23 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/printing/spoolssd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c index 56b283ccdd..63b3f80cff 100644 --- a/source3/printing/spoolssd.c +++ b/source3/printing/spoolssd.c @@ -103,7 +103,7 @@ static void update_conf(struct tevent_context *ev, { change_to_root_user(); lp_load(get_dyn_CONFIGFILE(), true, false, false, true); - reload_printers(ev, msg); + load_printers(ev, msg); spoolss_reopen_logs(spoolss_child_id); if (spoolss_child_id == 0) { @@ -237,7 +237,7 @@ static void spoolss_chld_sig_hup_handler(struct tevent_context *ev, change_to_root_user(); DEBUG(1,("Reloading printers after SIGHUP\n")); - reload_printers(ev, msg_ctx); + load_printers(ev, msg_ctx); spoolss_reopen_logs(spoolss_child_id); } |