From 875ce86ebfac111b2c2e6a24867203e1fabda0c0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Sat, 30 Aug 2008 09:43:26 +0000
Subject: [PATCH] - Handle IPP_FORBIDDEN (bug #460670).

---
 system-config-printer-forbidden.patch | 22 ++++++++++++++++++++++
 system-config-printer.spec            |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-forbidden.patch

diff --git a/system-config-printer-forbidden.patch b/system-config-printer-forbidden.patch
new file mode 100644
index 0000000..facb24a
--- /dev/null
+++ b/system-config-printer-forbidden.patch
@@ -0,0 +1,22 @@
+diff -up system-config-printer-1.0.7/authconn.py.forbidden system-config-printer-1.0.7/authconn.py
+--- system-config-printer-1.0.7/authconn.py.forbidden	2008-08-29 11:32:49.000000000 +0100
++++ system-config-printer-1.0.7/authconn.py	2008-08-30 10:42:09.000000000 +0100
+@@ -164,7 +164,8 @@ class Connection:
+                         raise cups.IPPError (cups.IPP_NOT_AUTHORIZED, '')
+                 break
+             except cups.IPPError, (e, m):
+-                if not self._cancel and e == cups.IPP_NOT_AUTHORIZED:
++                if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or
++                                         e == cups.IPP_FORBIDDEN):
+                     self._failed ()
+                 else:
+                     raise
+diff -U0 system-config-printer-1.0.7/ChangeLog.forbidden system-config-printer-1.0.7/ChangeLog
+--- system-config-printer-1.0.7/ChangeLog.forbidden	2008-08-29 11:32:49.000000000 +0100
++++ system-config-printer-1.0.7/ChangeLog	2008-08-30 10:42:09.000000000 +0100
+@@ -0,0 +1,5 @@
++2008-08-30  Tim Waugh  <twaugh@redhat.com>
++
++	* authconn.py (Connection._authloop): Handle IPP_FORBIDDEN (bug
++	#460670).
++
diff --git a/system-config-printer.spec b/system-config-printer.spec
index f90ad5d..cd18450 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch1: system-config-printer-forbidden.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -60,6 +62,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .forbidden
 
 %build
 %configure
@@ -149,6 +152,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Sat Aug 30 2008 Tim Waugh <twaugh@redhat.com> 1.0.7-2
+- Handle IPP_FORBIDDEN (bug #460670).
+
 * Fri Aug 29 2008 Tim Waugh <twaugh@redhat.com> 1.0.7-1
 - 1.0.7:
   - Efficiency improvements.