From 63d0991b843b6222c3398b4dc73bf090b6a53c47 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 27 2006 15:03:26 +0000
Subject: - Better LSPP fix for bug #216855.

- Resolves: rhbz#216855

---

diff --git a/cups-lspp.patch b/cups-lspp.patch
index bd63486..855fd78 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1174,7 +1174,7 @@
 +  security_context_t	devcon;		/* Printer's SELinux context */
 +  struct avc_entry_ref	avcref;		/* Pointer to the access vector cache */
 +  security_class_t	tclass;		/* Object class for the SELinux check */
-+  access_vector_t	avr = 0;	/* Access method being requested */
++  access_vector_t	avr;		/* Access method being requested */
 +#endif /* WITH_LSPP */
  
  
@@ -1221,7 +1221,7 @@
 +	tclass = SECCLASS_FILE;
 +	avr = FILE__WRITE;
 +      }
-+      else if (avr != FILE__WRITE || avr != CHR_FILE__WRITE)
++      else
 +      {
 +	cupsdLogMessage(CUPSD_LOG_ERROR,
 +			"StartJob: Printer is not a character device or regular file");
@@ -1530,7 +1530,7 @@
 +  security_context_t	devcon;		/* Printer's SELinux context */
 +  struct avc_entry_ref	avcref;		/* Pointer to the access vector cache */
 +  security_class_t	tclass;		/* Object class for the SELinux check */
-+  access_vector_t	avr = 0;	/* Access method being requested */
++  access_vector_t	avr;		/* Access method being requested */
 +#endif /* WITH_LSPP */
  
  
@@ -1600,7 +1600,7 @@
 +	tclass = SECCLASS_FILE;
 +	avr = FILE__WRITE;
 +      }
-+      else if (avr != FILE__WRITE || avr != CHR_FILE__WRITE)
++      else
 +      {
 +	send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file"));
 +	return (NULL);
diff --git a/cups.spec b/cups.spec
index ddebfad..e4d0d09 100644
--- a/cups.spec
+++ b/cups.spec
@@ -432,6 +432,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Nov 27 2006 Tim Waugh <twaugh@redhat.com>
+- Better LSPP fix for bug #216855.
+
 * Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com>
 - Use translated string for password prompt (STR #2121).