Merge changes from CUPS 1.4svn-r7242.

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

diff --git a/scheduler/policy.c b/scheduler/policy.c
index 25204ee89a51907dd91d2985a98ecbf8135fdece..d550af4c8d2fbff3ed4c687043cd9d3665602a5f 100644 (file)
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -3,7 +3,7 @@
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -98,7 +98,7 @@ cupsdAddPolicyOp(cupsd_policy_t   *p, /* I - Policy */
   if ((temp = calloc(1, sizeof(cupsd_location_t))) != NULL)
   {
     temp->op    = op;
-    temp->limit = AUTH_LIMIT_IPP;
+    temp->limit = CUPSD_AUTH_LIMIT_IPP;
 
     cupsArrayAdd(p->ops, temp);
 
@@ -120,12 +120,12 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,     /* I - Policy */
       for (i = 0; i < po->num_allow; i ++)
         switch (po->allow[i].type)
        {
-         case AUTH_IP :
+         case CUPSD_AUTH_IP :
              cupsdAllowIP(temp, po->allow[i].mask.ip.address,
                           po->allow[i].mask.ip.netmask);
              break;
 
-          case AUTH_INTERFACE :
+          case CUPSD_AUTH_INTERFACE :
              snprintf(name, sizeof(name), "@IF(%s)",
                       po->allow[i].mask.name.name);
               cupsdAllowHost(temp, name);
@@ -139,12 +139,12 @@ cupsdAddPolicyOp(cupsd_policy_t   *p,     /* I - Policy */
       for (i = 0; i < po->num_deny; i ++)
         switch (po->deny[i].type)
        {
-         case AUTH_IP :
+         case CUPSD_AUTH_IP :
              cupsdDenyIP(temp, po->deny[i].mask.ip.address,
                          po->deny[i].mask.ip.netmask);
              break;
 
-          case AUTH_INTERFACE :
+          case CUPSD_AUTH_INTERFACE :
              snprintf(name, sizeof(name), "@IF(%s)",
                       po->deny[i].mask.name.name);
               cupsdDenyHost(temp, name);