[Pkg-samba-maint] r1919 - in trunk/samba/debian: . patches

[vorlon at alioth.debian.org]

tags 479512 pending
thanks

Author: vorlon
Date: 2008-06-08 06:46:08 +0000 (Sun, 08 Jun 2008)
New Revision: 1919

Added:
   trunk/samba/debian/patches/no-unnecessary-cups.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
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.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-05-31 23:33:59 UTC (rev 1918)
+++ trunk/samba/debian/changelog	2008-06-08 06:46:08 UTC (rev 1919)
@@ -1,3 +1,10 @@
+samba (2:3.0.30-3) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Steve Langasek <vorlon at debian.org>  Sat, 07 Jun 2008 19:43:27 -0700
+
 samba (2:3.0.30-2) unstable; urgency=high
 
   * Brown paper bag releae with epoch increased after yet another

Added: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch	                        (rev 0)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch	2008-06-08 06:46:08 UTC (rev 1919)
@@ -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: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-05-31 23:33:59 UTC (rev 1918)
+++ trunk/samba/debian/patches/series	2008-06-08 06:46:08 UTC (rev 1919)
@@ -15,3 +15,4 @@
 smbpasswd-syslog.patch
 usershare.patch
 disable-weak-auth.patch
+no-unnecessary-cups.patch