[Pkg-cups-devel] r365 - in cupsys/branches/cups-1.2/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Fri Sep 15 12:45:17 2006
New Revision: 365

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/62_classes_crash.dpatch

Log:
correct classes patch to use num_printers. (#384654)

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Fri Sep 15 12:45:17 2006
@@ -11,6 +11,8 @@
   * Apply upstream svn r5958.
   * check modprobe command and /proc/modules dir exist before running
     modprobe (closes: #387176).
+  * 62_classes_crash: fix incorrect code. old code returned an error
+    even if user use the correct class configuration. (closes: #384654)
 
  -- Kenshi Muto <kmuto at debian.org>  Fri,  8 Sep 2006 11:28:12 +0200
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Fri Sep 15 12:45:17 2006
@@ -26,4 +26,4 @@
 #59_de_docroot.dpatch
 60_device_uri.dpatch
 #61_job_c_strangeloop.dpatch
-#62_classes_crash.dpatch
+62_classes_crash.dpatch

Modified: cupsys/branches/cups-1.2/debian/patches/62_classes_crash.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/62_classes_crash.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/62_classes_crash.dpatch	Fri Sep 15 12:45:17 2006
@@ -5,19 +5,18 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.2.2~/scheduler/classes.c cupsys-1.2.2/scheduler/classes.c
---- cupsys-1.2.2~/scheduler/classes.c	2006-08-13 08:07:43.000000000 +0000
-+++ cupsys-1.2.2/scheduler/classes.c	2006-08-13 08:56:01.000000000 +0000
-@@ -274,6 +274,12 @@
-   * Thanks to Joel Fredrikson for helping us get this right!
-   */
+diff -urNad cupsys-1.2.3~/scheduler/classes.c cupsys-1.2.3/scheduler/classes.c
+--- cupsys-1.2.3~/scheduler/classes.c	2006-02-22 22:43:17.000000000 +0000
++++ cupsys-1.2.3/scheduler/classes.c	2006-09-15 12:33:25.000000000 +0000
+@@ -279,6 +279,11 @@
+     if (i >= c->num_printers)
+       i = 0;
  
-+  if (c->last_printer == 0)
-+  {
-+     cupsdLogMessage(CUPSD_LOG_ERROR, "Class \"%s\" hasn't any printers!", name);
-+     return (NULL); /* strange, but there is no printer in class */
-+  }
++    if (c->num_printers == 0) {
++      cupsdLogMessage(CUPSD_LOG_ERROR, "Class \"%s\" hasn't any printers!", name);
++      return (NULL);
++    }
 +
-   for (i = c->last_printer + 1; ; i ++)
-   {
-     if (i >= c->num_printers)
+     if (c->printers[i]->accepting &&
+         (c->printers[i]->state == IPP_PRINTER_IDLE ||
+          ((c->printers[i]->type & CUPS_PRINTER_REMOTE) && !c->printers[i]->job)))