rpms/cups/F-11 cups-str3458.patch,NONE,1.1 cups.spec,1.559,1.560

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3458.patch 
Log Message:
* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
- Fixed ipp authentication for servers requiring authentication for
  IPP-Get-Printer-Attributes (bug #548873, STR #3458).


cups-str3458.patch:
 ipp.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cups-str3458.patch ---
diff -up cups-1.4.2/backend/ipp.c.str3458 cups-1.4.2/backend/ipp.c
--- cups-1.4.2/backend/ipp.c.str3458	2009-12-22 13:04:25.021208333 +0000
+++ cups-1.4.2/backend/ipp.c	2009-12-22 13:04:26.570082893 +0000
@@ -802,6 +802,15 @@ main(int  argc,				/* I - Number of comm
 
 	return (CUPS_BACKEND_STOP);
       }
+      else if (ipp_status == IPP_NOT_AUTHORIZED || ipp_status == IPP_FORBIDDEN)
+      {
+	if (!strncmp(httpGetField(http, HTTP_FIELD_WWW_AUTHENTICATE),
+		     "Negotiate", 9))
+	  auth_info_required = "negotiate";
+
+	fprintf(stderr, "ATTR: auth-info-required=%s\n", auth_info_required);
+	return (CUPS_BACKEND_AUTH_REQUIRED);
+      }
       else
       {
 	_cupsLangPrintf(stderr,


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -p -r1.559 -r1.560
--- cups.spec	21 Dec 2009 17:06:51 -0000	1.559
+++ cups.spec	22 Dec 2009 17:04:19 -0000	1.560
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -76,6 +76,7 @@ Patch61: cups-str3428.patch
 Patch62: cups-str3431.patch
 Patch63: cups-delete-active-printer.patch
 Patch64: cups-gnutls-gcrypt-threads.patch
+Patch65: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -256,6 +257,7 @@ module. 
 %patch62 -p1 -b .str3431
 %patch63 -p1 -b .delete-active-printer
 %patch64 -p1 -b .gnutls-gcrypt-threads
+%patch65 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -547,6 +549,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-19
+- Fixed ipp authentication for servers requiring authentication for
+  IPP-Get-Printer-Attributes (bug #548873, STR #3458).
+
 * Mon Dec 21 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-18
 - Ensure proper thread-safety in gnutls's use of libgcrypt
   (bug #544619).