Merge changes from CUPS 1.3.1.

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

diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index 8cd8fc9c21a8bc25dbe40f0c038bf8c78837a7fb..2a21d83ddc9926c7681ebe015937c1f65d7d47bc 100644 (file)
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,32 +1,23 @@
 /*
- * "$Id: quotas.c 4970 2006-01-24 14:05:45Z mike $"
+ * "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $"
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products.
+ *   Copyright 2007 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:
  *
- *   cupsdAddQuota()    - Add a quota record for this printer and user.
  *   cupsdFindQuota()   - Find a quota record.
  *   cupsdFreeQuotas()  - Free quotas for a printer.
  *   cupsdUpdateQuota() - Update quota data for the specified printer and user.
+ *   add_quota()        - Add a quota record for this printer and user.
  *   compare_quotas()   - Compare two quota records...
  */
 
@@ -41,39 +32,9 @@
  * Local functions...
  */
 
-static int     compare_quotas(const cupsd_quota_t *q1,
-                              const cupsd_quota_t *q2);
-
-
-/*
- * 'cupsdAddQuota()' - Add a quota record for this printer and user.
- */
-
-cupsd_quota_t *                                /* O - Quota data */
-cupsdAddQuota(cupsd_printer_t *p,      /* I - Printer */
-              const char      *username)/* I - User */
-{
-  cupsd_quota_t        *q;                     /* New quota data */
-
-
-  if (!p || !username)
-    return (NULL);
-
-  if (!p->quotas)
-    p->quotas = cupsArrayNew((cups_array_func_t)compare_quotas, NULL);
-
-  if (!p->quotas)
-    return (NULL);
-
-  if ((q = calloc(1, sizeof(cupsd_quota_t))) == NULL)
-    return (NULL);
-
-  strlcpy(q->username, username, sizeof(q->username));
-
-  cupsArrayAdd(p->quotas, q);
-
-  return (q);
-}
+static cupsd_quota_t   *add_quota(cupsd_printer_t *p, const char *username);
+static int             compare_quotas(const cupsd_quota_t *q1,
+                                      const cupsd_quota_t *q2);
 
 
 /*
@@ -87,17 +48,20 @@ 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);
   else
-    return (cupsdAddQuota(p, username));
+    return (add_quota(p, username));
 }
 
 
@@ -155,6 +119,19 @@ 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)
@@ -195,7 +172,7 @@ cupsdUpdateQuota(
     if (attr->values[0].integer < curtime)
     {
       if (JobAutoPurge)
-        cupsdCancelJob(job, 1);
+        cupsdCancelJob(job, 1, IPP_JOB_CANCELED);
 
       continue;
     }
@@ -216,6 +193,40 @@ cupsdUpdateQuota(
 }
 
 
+/*
+ * 'add_quota()' - Add a quota record for this printer and user.
+ */
+
+static cupsd_quota_t *                 /* O - Quota data */
+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)
+    return (NULL);
+
+  if (!p->quotas)
+    p->quotas = cupsArrayNew((cups_array_func_t)compare_quotas, NULL);
+
+  if (!p->quotas)
+    return (NULL);
+
+  if ((q = calloc(1, sizeof(cupsd_quota_t))) == NULL)
+    return (NULL);
+
+  strlcpy(q->username, username, sizeof(q->username));
+  if ((ptr = strchr(q->username, '@')) != NULL)
+    *ptr = '\0';                       /* Strip @domain/@KDC */
+
+  cupsArrayAdd(p->quotas, q);
+
+  return (q);
+}
+
+
 /*
  * 'compare_quotas()' - Compare two quota records...
  */
@@ -229,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1,     /* I - First quota record */
 
 
 /*
- * End of "$Id: quotas.c 4970 2006-01-24 14:05:45Z mike $".
+ * End of "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $".
  */