rpms/cups/F-8 cups-undo-str2537.patch, 1.3, 1.4 cups.spec, 1.390, 1.391

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups-undo-str2537.patch cups.spec 
Log Message:
* Fri May  2 2008 Tim Waugh <twaugh at redhat.com>
- Include the hostname in the charset error (part of bug #441719).


cups-undo-str2537.patch:

Index: cups-undo-str2537.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups-undo-str2537.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-undo-str2537.patch	10 Apr 2008 10:13:40 -0000	1.3
+++ cups-undo-str2537.patch	2 May 2008 07:12:05 -0000	1.4
@@ -6352,16 +6352,17 @@
        {
         /*
  	* Return an error, since attributes-charset,
-@@ -438,6 +420,13 @@
+@@ -438,6 +420,14 @@
        }
        else
        {
 +	if (strcasecmp (charset->values[0].string.text, "us-ascii") &&
 +	    strcasecmp (charset->values[0].string.text, "utf-8"))
-+	  cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"! "
++	  cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\" "
++			  "from host %s! "
 +			  "Clients must use us-ascii or utf-8.  Future "
 +			  "versions will reject this request.",
-+			  charset->values[0].string.text);
++			  con->http.hostname, charset->values[0].string.text);
 +
         /*
  	* OK, all the checks pass so far; make sure requesting-user-name is


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- cups.spec	10 Apr 2008 10:13:40 -0000	1.390
+++ cups.spec	2 May 2008 07:12:05 -0000	1.391
@@ -453,6 +453,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri May  2 2008 Tim Waugh <twaugh at redhat.com>
+- Include the hostname in the charset error (part of bug #441719).
+
 * Thu Apr 10 2008 Tim Waugh <twaugh at redhat.com>
 - Log an error when a client requests a charset other than ASCII or UTF-8.