Changing the printer-is-shared value for a remote queue did not produce an

[thirdparty/cups.git] / scheduler / quotas.c

diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index 5ea8f8a267027b59e80a8faa95157b49e3de9aa7..9f0b6c0a335582f30cae6e110e872975dd8519e5 100644 (file)
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: quotas.c 6541 2007-05-23 20:18:00Z mike $"
+ * "$Id$"
  *
- *   Quota routines for the Common UNIX Printing System (CUPS).
+ *   Quota routines for the CUPS scheduler.
  *
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
@@ -57,12 +48,15 @@ cupsdFindQuota(
 {
   cupsd_quota_t        *q,                     /* Quota data pointer */
                match;                  /* Search data */
+  char         *ptr;                   /* Pointer into username */
 
 
   if (!p || !username)
     return (NULL);
 
   strlcpy(match.username, username, sizeof(match.username));
+  if ((ptr = strchr(match.username, '@')) != NULL)
+    *ptr = '\0';                       /* Strip @domain/@KDC */
 
   if ((q = (cupsd_quota_t *)cupsArrayFind(p->quotas, &match)) != NULL)
     return (q);
@@ -125,19 +119,6 @@ cupsdUpdateQuota(
                   "cupsdUpdateQuota: p=%s username=%s pages=%d k=%d",
                   p->name, username, pages, k);
 
-#if defined(__APPLE__) && defined(HAVE_DLFCN_H)
- /*
-  * Use Apple PrintService quota enforcement if installed (X Server only)
-  */
-
-  if (AppleQuotas && PSQUpdateQuotaProc)
-  { 
-    q->page_count = (*PSQUpdateQuotaProc)(p->name, p->info, username, pages, 0);
-
-    return (q);
-  }
-#endif /* __APPLE__ && HAVE_DLFCN_H */
-
   curtime = time(NULL);
 
   if (curtime < q->next_update)
@@ -161,8 +142,20 @@ cupsdUpdateQuota(
        job;
        job = (cupsd_job_t *)cupsArrayNext(Jobs))
   {
-    if (strcasecmp(job->dest, p->name) != 0 ||
-        strcasecmp(job->username, q->username) != 0)
+   /*
+    * We only care about the current printer/class and user...
+    */
+
+    if (_cups_strcasecmp(job->dest, p->name) != 0 ||
+        _cups_strcasecmp(job->username, q->username) != 0)
+      continue;
+
+   /*
+    * Make sure attributes are loaded; we always call cupsdLoadJob() to ensure
+    * the access_time member is updated so the job isn't unloaded right away...
+    */
+
+    if (!cupsdLoadJob(job))
       continue;
 
     if ((attr = ippFindAttribute(job->attrs, "time-at-completion",
@@ -172,13 +165,14 @@ cupsdUpdateQuota(
         attr = ippFindAttribute(job->attrs, "time-at-creation",
                                 IPP_TAG_INTEGER);
 
-    if (attr == NULL)
-      break;
-
     if (attr->values[0].integer < curtime)
     {
-      if (JobAutoPurge)
-        cupsdCancelJob(job, 1, IPP_JOB_CANCELED);
+     /*
+      * This job is too old to count towards the quota, ignore it...
+      */
+
+      if (JobAutoPurge && !job->printer && job->state_value > IPP_JOB_STOPPED)
+        cupsdDeleteJob(job, CUPSD_JOB_PURGE);
 
       continue;
     }
@@ -208,6 +202,7 @@ add_quota(cupsd_printer_t *p,               /* I - Printer */
           const char      *username)   /* I - User */
 {
   cupsd_quota_t        *q;                     /* New quota data */
+  char         *ptr;                   /* Pointer into username */
 
 
   if (!p || !username)
@@ -223,6 +218,8 @@ add_quota(cupsd_printer_t *p,               /* I - Printer */
     return (NULL);
 
   strlcpy(q->username, username, sizeof(q->username));
+  if ((ptr = strchr(q->username, '@')) != NULL)
+    *ptr = '\0';                       /* Strip @domain/@KDC */
 
   cupsArrayAdd(p->quotas, q);
 
@@ -238,10 +235,10 @@ static int                                /* O - Result of comparison */
 compare_quotas(const cupsd_quota_t *q1,        /* I - First quota record */
                const cupsd_quota_t *q2)        /* I - Second quota record */
 {
-  return (strcasecmp(q1->username, q2->username));
+  return (_cups_strcasecmp(q1->username, q2->username));
 }
 
 
 /*
- * End of "$Id: quotas.c 6541 2007-05-23 20:18:00Z mike $".
+ * End of "$Id$".
  */