[Pkg-samba-maint] r2017 - in branches/samba/experimental/debian: . patches

[vorlon at alioth.debian.org]

tags 479512 pending
thanks

Author: vorlon
Date: 2008-07-06 10:09:17 +0000 (Sun, 06 Jul 2008)
New Revision: 2017

Added:
   branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/patches/series
Log:
merge r1919

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 09:54:10 UTC (rev 2016)
+++ branches/samba/experimental/debian/changelog	2008-07-06 10:09:17 UTC (rev 2017)
@@ -44,6 +44,10 @@
 
   [ Steve Langasek ]
   * New upstream release
+  * Merged from unstable:
+    * debian/patches/no-unnecessary-cups.patch: don't try to connect to a
+      cups server when we know that no printers are configured.
+      Closes: #479512.
 
   [ Jelmer Vernooij ]
   * Merged from unstable:

Copied: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch (from rev 1919, trunk/samba/debian/patches/no-unnecessary-cups.patch)
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	                        (rev 0)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2008-07-06 10:09:17 UTC (rev 2017)
@@ -0,0 +1,22 @@
+Goal: Don't try to contact the CUPS server when we can reliably
+determine that no printers are needed
+
+Fixes: bug #479512
+
+Upstream status: submitted as bugzilla bug #5525
+
+Index: samba-3.0.30/source/smbd/server.c
+===================================================================
+--- samba-3.0.30/source/smbd/server.c	(revision 1918)
++++ samba-3.0.30/source/smbd/server.c	(working copy)
+@@ -624,6 +624,10 @@
+ 	int pnum = lp_servicenumber(PRINTERS_NAME);
+ 	const char *pname;
+ 
++	if (!lp_load_printers()
++	    && (lp_auto_services() == NULL || !strcmp(lp_auto_services(),"")))
++		return;
++
+ 	pcap_cache_reload();
+ 
+ 	/* remove stale printers */

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2008-07-06 09:54:10 UTC (rev 2016)
+++ branches/samba/experimental/debian/patches/series	2008-07-06 10:09:17 UTC (rev 2017)
@@ -15,3 +15,4 @@
 usershare.patch
 swat-de.patch
 smbtar-bashism.patch
+no-unnecessary-cups.patch