rpms/cups/FC-6 cups-str2393.patch,NONE,1.1 cups.spec,1.330,1.331

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14016

Modified Files:
	cups.spec 
Added Files:
	cups-str2393.patch 
Log Message:
* Mon May 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
- Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057).
- Resolves: rhbz#238057


cups-str2393.patch:
 adminutil.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE cups-str2393.patch ---
--- cups-1.2.10/cups/adminutil.c.adminutil	2007-05-21 16:39:00.000000000 +0100
+++ cups-1.2.10/cups/adminutil.c	2007-05-21 16:45:31.000000000 +0100
@@ -1260,14 +1260,21 @@
     {
       if (!wrote_browsing)
       {
+	int new_remote_printers = (remote_printers > 0 ||
+				   (remote_printers == -1 &&
+				    old_remote_printers > 0));
+	int new_share_printers = (share_printers > 0 ||
+				  (share_printers == -1 &&
+				   old_share_printers > 0));
+
         wrote_browsing = 1;
 
-        if (remote_printers > 0 || share_printers > 0)
+        if (new_remote_printers | new_share_printers)
 	{
-	  if (remote_printers > 0 && share_printers > 0)
+	  if (new_remote_printers && new_share_printers)
 	    cupsFilePuts(temp,
 	                 "# Enable printer sharing and shared printers.\n");
-	  else if (remote_printers > 0)
+	  else if (new_remote_printers)
 	    cupsFilePuts(temp,
 	                 "# Show shared printers on the local network.\n");
 	  else
@@ -1277,14 +1284,14 @@
 	  cupsFilePuts(temp, "Browsing On\n");
 	  cupsFilePuts(temp, "BrowseOrder allow,deny\n");
 
-	  if (remote_printers > 0)
+	  if (new_remote_printers)
 	  {
 	    cupsFilePuts(temp, "# (Change '@LOCAL' to 'ALL' if using "
 	                       "directed broadcasts from another subnet.)\n");
 	    cupsFilePuts(temp, "BrowseAllow @LOCAL\n");
 	  }
 
-	  if (share_printers > 0)
+	  if (new_share_printers)
 	    cupsFilePuts(temp, "BrowseAddress @LOCAL\n");
         }
 	else


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- cups.spec	9 May 2007 13:08:38 -0000	1.330
+++ cups.spec	21 May 2007 16:11:37 -0000	1.331
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.10
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -50,6 +50,7 @@
 Patch24: cups-str2109.patch
 Patch25: cups-usb-paperout.patch
 Patch26: cups-str2348.patch
+Patch27: cups-str2393.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -161,6 +162,7 @@
 %patch24 -p1 -b .str2109
 %patch25 -p1 -b .usb-paperout
 %patch26 -p1 -b .str2348
+%patch27 -p1 -b .str2393
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -444,6 +446,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon May 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-7
+- Fixed _cupsAdminSetServerSettings() sharing/shared handling (bug #238057).
+
 * Wed May  9 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-6
 - Applied fix for rotated PDFs (bug #236753, STR #2348).