The branch, master has been updated
via ad37341 s3-spoolssd: Remove stale printers only on a valid pcap
update.
from 1316bc4 s4-provision handle a number of invalid but real-world
upgrade cases
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ad3734194991f55492b92a6330f055c10e6fd1e1
Author: Andreas Schneider <[email protected]>
Date: Thu Sep 1 14:25:07 2011 +0200
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 <[email protected]>
Autobuild-Date: Mon Sep 5 11:18:23 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/printing/spoolssd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 56b283c..63b3f80 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);
}
--
Samba Shared Repository
