[Pkg-samba-maint] r2885 - branches/samba/experimental/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-06-20 12:43:05 +0000 (Sat, 20 Jun 2009)
New Revision: 2885

Modified:
   branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
Log:
Revert removal


Modified: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2009-06-20 12:31:34 UTC (rev 2884)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch	2009-06-20 12:43:05 UTC (rev 2885)
@@ -5,6 +5,29 @@
 
 Upstream status: submitted as bugzilla bug #5525
 
+Index: samba-3.3.0rc2/source/smbd/server.c
+===================================================================
+--- samba-3.3.0rc2.orig/source/smbd/server.c
++++ samba-3.3.0rc2/source/smbd/server.c
+@@ -806,6 +806,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 */
+=======
+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.3.0rc2/source3/smbd/server.c
 ===================================================================
 --- samba-3.3.0rc2.orig/source3/smbd/server.c