rpms/cups/F-11 cups-str3285.patch,NONE,1.1 cups.spec,1.502,1.503

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5618

Modified Files:
	cups.spec 
Added Files:
	cups-str3285.patch 
Log Message:
* Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
- Fixed cupsGetNamedDest() so it does not fall back to the default
  printer when a destination has been named (bug #516439, STR #3285).


cups-str3285.patch:
 dest.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE cups-str3285.patch ---
diff -up cups-1.4rc1/cups/dest.c.str3285 cups-1.4rc1/cups/dest.c
--- cups-1.4rc1/cups/dest.c.str3285	2009-08-10 11:32:08.397714492 +0100
+++ cups-1.4rc1/cups/dest.c	2009-08-10 11:32:14.143839210 +0100
@@ -549,7 +549,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || name != NULL)
       return (NULL);
 
    /*
@@ -557,7 +557,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
     * configuration file does not exist.  Find out the real default.
     */
 
-    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest))
+    if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest))
       return (NULL);
   }
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -p -r1.502 -r1.503
--- cups.spec	10 Aug 2009 09:37:15 -0000	1.502
+++ cups.spec	10 Aug 2009 10:45:40 -0000	1.503
@@ -64,6 +64,7 @@ Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
 Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
+Patch40: cups-str3285.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -228,6 +229,7 @@ module. 
 %patch37 -p1 -b .avahi
 %patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
+%patch40 -p1 -b .str3285
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -523,6 +525,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Aug 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.15
+- Fixed cupsGetNamedDest() so it does not fall back to the default
+  printer when a destination has been named (bug #516439, STR #3285).
 - Fixed MIME type rules for image/jpeg and image/x-bitmap
   (bug #516438, STR #3284).
 - Clear out cache files on upgrade.