From 125dce6e634c5b25781947d574a5ebc0efeb1f27 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 22 Nov 2006 12:02:15 +0000
Subject: [PATCH] - Another LSPP fix (bug #216669). - Resolves: rhbz#216669

---
 cups-lspp.patch | 10 ++++++----
 cups.spec       |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cups-lspp.patch b/cups-lspp.patch
index f1406bc..fffcf1c 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -938,8 +938,8 @@
  #endif /* !_CUPS_CONFIG_H_ */
  
  /*
---- cups-1.2.7/scheduler/printers.c.lspp	2006-11-22 11:40:41.000000000 +0000
-+++ cups-1.2.7/scheduler/printers.c	2006-11-22 11:40:42.000000000 +0000
+--- cups-1.2.7/scheduler/printers.c	2006-11-22 11:40:42.000000000 +0000
++++ cups-1.2.7/scheduler/printers.c	2006-11-22 11:23:38.000000000 +0000
 @@ -57,6 +57,8 @@
   *                                 printing desktop tools.
   */
@@ -974,13 +974,14 @@
  
  
    DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -1579,6 +1592,42 @@
+@@ -1579,6 +1592,44 @@
        attr->values[1].string.text = _cupsStrAlloc(Classification ?
  	                                   Classification : p->job_sheets[1]);
      }
 +#ifdef WITH_LSPP
 +    if (AuditLog != -1)
 +    {
++      char uri[HTTP_MAX_URI];
 +      audit_message = NULL;
 +      rangestr = NULL;
 +      printercon = 0;
@@ -1004,8 +1005,9 @@
 +      else
 +        rangestr = strdup("unknown");
 +
++      cupsdSanitizeURI(p->device_uri, uri, sizeof(uri));
 +      cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s",
-+                      p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1], rangestr);
++                      p->name, uri, p->job_sheets[0], p->job_sheets[1], rangestr);
 +      audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
 +                             ServerName, NULL, NULL, 1);
 +      if (printercon)
diff --git a/cups.spec b/cups.spec
index 3dc0320..f8af921 100644
--- a/cups.spec
+++ b/cups.spec
@@ -431,6 +431,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Nov 22 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.7-4
+- Another LSPP fix (bug #216669).
 - Fixed LSPP SELinux check (bug #216855).
 - Increased PPD timeout in copy_model() (bug #216065).