Fix policy loading for printers and classes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6423 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/classes.c b/scheduler/classes.c
index f02b03091baaa226de9b747ecb62f37d9777edfd..4037c37aad3cf7760c53fc4d3460a34f4111cc55 100644 (file)
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -682,7 +682,20 @@ cupsdLoadAllClasses(void)
     else if (!strcasecmp(line, "OpPolicy"))
     {
       if (value)
-        cupsdSetString(&p->op_policy, value);
+      {
+        cupsd_policy_t *pol;           /* Policy */
+
+
+        if ((pol = cupsdFindPolicy(value)) != NULL)
+       {
+          cupsdSetString(&p->op_policy, value);
+         p->op_policy_ptr = pol;
+       }
+       else
+         cupsdLogMessage(CUPSD_LOG_ERROR,
+                         "Bad policy \"%s\" on line %d of classes.conf",
+                         value, linenum);
+      }
       else
       {
        cupsdLogMessage(CUPSD_LOG_ERROR,

diff --git a/scheduler/printers.c b/scheduler/printers.c
index b49e0c748d157a2ee74b829d637c183c15e93cf3..498ba8e5bef4db627d28e2044bc46d67df23c9bf 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1194,7 +1194,20 @@ cupsdLoadAllPrinters(void)
     else if (!strcasecmp(line, "OpPolicy"))
     {
       if (value)
-        cupsdSetString(&p->op_policy, value);
+      {
+        cupsd_policy_t *pol;           /* Policy */
+
+
+        if ((pol = cupsdFindPolicy(value)) != NULL)
+       {
+          cupsdSetString(&p->op_policy, value);
+         p->op_policy_ptr = pol;
+       }
+       else
+         cupsdLogMessage(CUPSD_LOG_ERROR,
+                         "Bad policy \"%s\" on line %d of printers.conf",
+                         value, linenum);
+      }
       else
       {
        cupsdLogMessage(CUPSD_LOG_ERROR,