rpms/cups/F-8 cups-str2750.patch,NONE,1.1 cups.spec,1.394,1.395

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str2750.patch 
Log Message:
* Tue Jun  3 2008 Tim Waugh <twaugh at redhat.com>
- 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-8/cups.spec,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- cups.spec	30 May 2008 16:14:40 -0000	1.394
+++ cups.spec	3 Jun 2008 15:09:20 -0000	1.395
@@ -41,6 +41,7 @@
 Patch15: cups-undo-str2537.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
@@ -156,6 +157,7 @@
 %patch15 -p1 -b .undo-str2537
 %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
@@ -455,6 +457,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Jun  3 2008 Tim Waugh <twaugh at redhat.com>
+- Applied patch to fix STR #2750 (IPP authentication).
+
 * Fri May 30 2008 Tim Waugh <twaugh at redhat.com>
 - For LSPP, pass the job's scon to copy_banner in cupsdTimeoutJob, and
   check that it is not NULL in copy_banner (bug #447200).