Merge changes from CUPS 1.4svn-r7614.

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

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 32e4dc2ad4b79f13677e92224a1cb9e4ac918244..58e27f2f21c2f1420710d99aa64725ea5c7cd7ff 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -10793,7 +10793,7 @@ user_allowed(cupsd_printer_t *p,        /* I - Printer or class */
 
   for (i = 0; i < p->num_users; i ++)
   {
-    if (p->users[i][0] == '@' || p->users[i][0] == '#')
+    if (p->users[i][0] == '@')
     {
      /*
       * Check group membership...
@@ -10802,6 +10802,15 @@ user_allowed(cupsd_printer_t *p,       /* I - Printer or class */
       if (cupsdCheckGroup(username, pw, p->users[i] + 1))
         break;
     }
+    else if (p->users[i][0] == '#')
+    {
+     /*
+      * Check UUID...
+      */
+
+      if (cupsdCheckGroup(username, pw, p->users[i]))
+        break;
+    }
     else if (!strcasecmp(username, p->users[i]))
       break;
   }