- applied upstream

[packages/cups.git] / cups-satisfy-any.patch

diff --git a/cups-satisfy-any.patch b/cups-satisfy-any.patch
index a59eb64d9a1aff79ef715777b94331affcc4cb41..fa6fcb9f5cd516ceeab06e94428b4e2b95b09b0e 100644 (file)
--- a/cups-satisfy-any.patch
+++ b/cups-satisfy-any.patch
@@ -1,21 +1,23 @@
 
-Removed code prevented "Satisfy Any" directive to work, cupsdCheckPolicy checks
-for auth info AND allow/deny access lists and does its job properly so checking
-again just for auth info is The Wrong Thing as there may be an access list
-allowing unauthorized clients based on their IP.
+Removed code prevented "Satisfy Any" directive from working, cupsdCheckPolicy
+checks for auth info AND allow/deny access lists and does its job properly
+so checking again just for auth info is The Wrong Thing as there may be
+an access list allowing unauthorized clients based on their IP.
 
---- cups-1.3.4/scheduler/ipp.c~        2007-10-22 22:27:22.000000000 +0200
-+++ cups-1.3.4/scheduler/ipp.c 2007-12-06 18:25:11.000000000 +0100
-@@ -1294,12 +1294,6 @@
+--- cups-1.3.8/scheduler/ipp.c~        2008-07-23 14:09:50.444066834 +0200
++++ cups-1.3.8/scheduler/ipp.c 2008-07-23 14:11:36.356848959 +0200
+@@ -1301,13 +1301,7 @@
      send_http_error(con, status, printer);
      return (NULL);
    }
--  else if ((printer->type & CUPS_PRINTER_AUTHENTICATED) &&
+-  else if (printer->num_auth_info_required > 0 &&
+-           strcmp(printer->auth_info_required[0], "none") &&
 -           !con->username[0] && !auth_info)
 -  {
 -    send_http_error(con, HTTP_UNAUTHORIZED, printer);
 -    return (NULL);
 -  }
++
  #ifdef HAVE_SSL
    else if (auth_info && !con->http.tls &&
             !httpAddrLocalhost(con->http.hostaddr))