rpms/cups/F-9 cups-str2750.patch,NONE,1.1 cups.spec,1.414,1.415

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13893

Modified Files:
	cups.spec 
Added Files:
	cups-str2750.patch 
Log Message:
* Tue Jun  3 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-6
- Applied patch to fix STR #2750 (IPP authentication).


cups-str2750.patch:

--- NEW FILE cups-str2750.patch ---
diff -up cups-1.3.7/backend/ipp.c.str2750 cups-1.3.7/backend/ipp.c
--- cups-1.3.7/backend/ipp.c.str2750	2008-06-03 16:07:31.000000000 +0100
+++ cups-1.3.7/backend/ipp.c	2008-06-03 16:07:43.000000000 +0100
@@ -1483,7 +1483,7 @@ password_cb(const char *prompt)		/* I - 
 {
   (void)prompt;
 
-  if (password && password_tries < 3)
+  if (password && *password && password_tries < 3)
   {
     password_tries ++;
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -r1.414 -r1.415
--- cups.spec	30 May 2008 16:13:09 -0000	1.414
+++ cups.spec	3 Jun 2008 15:13:16 -0000	1.415
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.7
-Release: 5%{?svn:.svn%{svn}}%{?dist}
+Release: 6%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch15: cups-peercred.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
+Patch18: cups-str2750.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -158,6 +159,7 @@
 %patch15 -p1 -b .peercred
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
+%patch18 -p1 -b .str2750
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -442,6 +444,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun  3 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-6
+- Applied patch to fix STR #2750 (IPP authentication).
+
 * Fri May 30 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-5
 - Better fix for cupsdTimeoutJob LSPP configuration suggested by
   Matt Anderson (bug #447200).