Attachment 304360 Details for Bug 441719 – My hack to cups-1.3.4+ to log but not reject bad locale

[patch] My hack to cups-1.3.4+ to log but not reject bad locale

cups-1.3-localehack.patch (text/plain), 1.32 KB, created by Jonathan Peatfield on 2008-05-02 04:17:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Peatfield

Created: 2008-05-02 04:17:16 UTC

Size: 1.32 KB

patch

obsolete

>--- cups-1.3.4/scheduler/ipp.c.localehack	2007-11-12 21:15:36.000000000 +0000
>+++ cups-1.3.4/scheduler/ipp.c	2007-11-12 21:56:07.000000000 +0000
>@@ -465,17 +465,26 @@
>         * Bad character set...
> 	*/
> 
>-        cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\"!",
>-	                charset->values[0].string.text);
>+	/* Log connecting host too so we see it even is loglevel isn't debug */
>+        cupsdLogMessage(CUPSD_LOG_ERROR, "Unsupported character set \"%s\" from host %s!",
>+	                charset->values[0].string.text,
>+			con->http.hostname);
> 	cupsdAddEvent(CUPSD_EVENT_SERVER_AUDIT, NULL, NULL,
> 		      "%04X %s Unsupported attributes-charset value \"%s\"",
> 		      IPP_CHARSET, con->http.hostname,
> 		      charset->values[0].string.text);
>+#ifdef ENFORCE_CHARSET_HARD
> 	send_ipp_status(con, IPP_BAD_REQUEST,
> 	                _("Unsupported character set \"%s\"!"),
> 	                charset->values[0].string.text);
>+#endif /* ENFORCE_CHARSET_HARD */
>       }
>-      else if (!charset || !language ||
>+#ifdef ENFORCE_CHARSET_HARD
>+      /* Yes this is an utter hack! */
>+      else
>+#endif /* ENFORCE_CHARSET_HARD */
>+
>+	if (!charset || !language ||
> 	       (!uri &&
> 	        con->request->request.op.operation_id != CUPS_GET_DEFAULT &&
> 	        con->request->request.op.operation_id != CUPS_GET_PRINTERS &&

Actions: View | Diff

Attachments on bug 441719: 304360