From 1aa3e9122071715fbb86d5bb02b3bf13f21fa789 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Aug 11 2008 16:34:51 +0000
Subject: - Better password prompting behaviour (bug #215133, STR #2101).


---

diff --git a/cups-str2101.patch b/cups-str2101.patch
new file mode 100644
index 0000000..d889143
--- /dev/null
+++ b/cups-str2101.patch
@@ -0,0 +1,30 @@
+diff -up cups-1.3.8/scheduler/auth.c.str2101 cups-1.3.8/scheduler/auth.c
+--- cups-1.3.8/scheduler/auth.c.str2101	2008-08-11 15:12:12.000000000 +0100
++++ cups-1.3.8/scheduler/auth.c	2008-08-11 15:12:37.000000000 +0100
+@@ -2098,7 +2098,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/
+ 	  return (HTTP_OK);
+       }
+ 
+-      return (HTTP_UNAUTHORIZED);
++      return (HTTP_FORBIDDEN);
+     }
+ #endif /* HAVE_AUTHORIZATION_H */
+ 
+@@ -2122,7 +2122,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/
+         return (HTTP_OK);
+     }
+ 
+-    return (HTTP_UNAUTHORIZED);
++    return (HTTP_FORBIDDEN);
+   }
+ 
+  /*
+@@ -2159,7 +2159,7 @@ cupsdIsAuthorized(cupsd_client_t *con,	/
+   cupsdLogMessage(CUPSD_LOG_DEBUG,
+                   "cupsdIsAuthorized: User not in group(s)!");
+ 
+-  return (HTTP_UNAUTHORIZED);
++  return (HTTP_FORBIDDEN);
+ }
+ 
+ 
diff --git a/cups.spec b/cups.spec
index bd01f2f..e58e5ec 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.8
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -48,6 +48,7 @@ Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-getnameddest.patch
 Patch23: cups-str2892.patch
+Patch24: cups-str2101.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -170,6 +171,7 @@ lpd emulation.
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .getnameddest
 %patch23 -p1 -b .str2892
+%patch24 -p1 -b .str2101
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -457,6 +459,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Aug 11 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.8-4
+- Better password prompting behaviour (bug #215133, STR #2101).
+
 * Tue Aug  5 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.8-3
 - Mark template files config(noreplace) for site-local modifications
   (bug #441719).