Merge changes from CUPS 1.3.1.

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

diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index a9bfd01639303d77fbb5f30a692c63758f4bc29b..2a21d83ddc9926c7681ebe015937c1f65d7d47bc 100644 (file)
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: quotas.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $"
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
@@ -48,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);
@@ -199,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)
@@ -214,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);
 
@@ -234,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1,     /* I - First quota record */
 
 
 /*
- * End of "$Id: quotas.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: quotas.c 6949 2007-09-12 21:33:23Z mike $".
  */