From 29c4b9e02b4eaf4b1aeac0c9b3abf2f8e7c755ed Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Dec 04 2009 15:49:09 +0000
Subject: - The web interface prevented conflicting options from being adjusted (bug

    #533426, STR #3439).

---

diff --git a/cups-str3439.patch b/cups-str3439.patch
new file mode 100644
index 0000000..f0e8b7b
--- /dev/null
+++ b/cups-str3439.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.4.2/cgi-bin/admin.c.str3439 cups-1.4.2/cgi-bin/admin.c
+--- cups-1.4.2/cgi-bin/admin.c.str3439	2009-12-04 15:48:21.181907084 +0000
++++ cups-1.4.2/cgi-bin/admin.c	2009-12-04 15:48:21.199906005 +0000
+@@ -3327,7 +3327,7 @@ do_set_options(http_t *http,		/* I - HTT
+       }
+   }
+ 
+-  if (!have_options || ppdConflicts(ppd))
++  if (!have_options)
+   {
+    /*
+     * Show the options to the user...
diff --git a/cups.spec b/cups.spec
index 76b6e5f..07f04a9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -62,6 +62,7 @@ Patch34: cups-str3418.patch
 Patch35: cups-CVE-2009-3553.patch
 Patch36: cups-str3422.patch
 Patch37: cups-str3413.patch
+Patch38: cups-conflicts.patch
 
 Patch100: cups-lspp.patch
 
@@ -232,6 +233,7 @@ module.
 %patch35 -p1 -b .CVE-2009-3553
 %patch36 -p1 -b .str3422
 %patch37 -p1 -b .str3413
+%patch38 -p1 -b .str3439
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -532,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec  4 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-12
+- The web interface prevented conflicting options from being adjusted
+  (bug #533426, STR #3439).
+
 * Thu Dec  3 2009 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-11
 - Fixes for SNMP scanning with Lexmark printers (bug #542857, STR #3413).